This commit was manufactured by cvs2svn to create tag 'v201106241918'. Sprout from ptp_4_0 2011-06-13 17:30:39 UTC David Wootton <dwootton@us.ibm.com> 'Bug 349206 - Startup errors for PE application using PE resource manager' 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.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/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 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/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/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 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/pldt/org.eclipse.ptp.pldt.common/.classpath tools/pldt/org.eclipse.ptp.pldt.common/.cvsignore tools/pldt/org.eclipse.ptp.pldt.common/.project tools/pldt/org.eclipse.ptp.pldt.common/.settings/org.eclipse.jdt.core.prefs tools/pldt/org.eclipse.ptp.pldt.common/META-INF/MANIFEST.MF tools/pldt/org.eclipse.ptp.pldt.common/about.html tools/pldt/org.eclipse.ptp.pldt.common/about.ini tools/pldt/org.eclipse.ptp.pldt.common/about.mappings tools/pldt/org.eclipse.ptp.pldt.common/about.properties tools/pldt/org.eclipse.ptp.pldt.common/build.properties tools/pldt/org.eclipse.ptp.pldt.common/eclipse32.png tools/pldt/org.eclipse.ptp.pldt.common/icons/.cvsignore tools/pldt/org.eclipse.ptp.pldt.common/icons/analyze.gif tools/pldt/org.eclipse.ptp.pldt.common/icons/filter_ps.gif tools/pldt/org.eclipse.ptp.pldt.common/plugin.properties tools/pldt/org.eclipse.ptp.pldt.common/plugin.xml tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/Artifact.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/ArtifactManager.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/ArtifactMarkingVisitor.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/CommonPlugin.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/IArtifact.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/IDs.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/ScanReturn.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/actions/AnalysisDropdownHandler.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/actions/RunAnalyseHandler.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/actions/RunAnalyseHandlerBase.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/analysis/PldtAstVisitor.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/AllFunctions.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/CHelpBookImpl.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/CHelpProviderImpl.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/CHelpResourceDescriptorImpl.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/FunctionPrototypeSummaryImpl.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/FunctionSummaryImpl.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/messages/Messages.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/messages/messages.properties tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/prefs/PLDTPreferencePage.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/prefs/PreferenceConstants.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/prefs/PreferenceInitializer.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/util/AnalysisUtil.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/util/SourceInfo.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/util/Utility.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/util/ViewActivater.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/util/ViewActivator.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/views/SimpleTableMarkerView.java tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/views/SimpleTreeTableMarkerView.java tools/pldt/org.eclipse.ptp.pldt.doc.user/.classpath tools/pldt/org.eclipse.ptp.pldt.doc.user/.cvsignore tools/pldt/org.eclipse.ptp.pldt.doc.user/.project tools/pldt/org.eclipse.ptp.pldt.doc.user/.settings/org.eclipse.jdt.core.prefs tools/pldt/org.eclipse.ptp.pldt.doc.user/META-INF/MANIFEST.MF tools/pldt/org.eclipse.ptp.pldt.doc.user/about.html tools/pldt/org.eclipse.ptp.pldt.doc.user/build.properties tools/pldt/org.eclipse.ptp.pldt.doc.user/html/barrier.html tools/pldt/org.eclipse.ptp.pldt.doc.user/html/help.css tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/BarrierMatchingSetView.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/BarrierView.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/analyze.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrier.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierActionAnn.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierErrorView.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierErrors.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierMarkerRemove.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierMatches.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierPathSelection.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/cdtPrefsTemplates.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/clearMarkers.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/contentAssist.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/helpContSens.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/helpContSensHitF1.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/helpContSensHitF1click.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/hover.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/include.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/lib.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/makefileProjProps.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/makefileProject.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/menuShowOpenMPartifacts.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/menuShowUPCartifacts.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiBuildCommand.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiButtons.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiMenu.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiNewProjectWorkbench.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiPrefsHaveNotBeenSet.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiTemplates.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiTemplatesMod.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiViewAnn.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiWizard.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiWizard2.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiWizard3.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/newProjOpenMP.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/newProjOpenMPsettings.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/ompCompilerOpt.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/openmpArtifactsfound.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/openmpPrefs.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/pldt-menu.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/pldt-prefs1.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/pldtIconMisplaced.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/ptp-openMPpragmaAnn.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/ptp-openMPproblems.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/ptp-openMPshowConcurrency.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/ptp-openMPshowConcurrencymenu.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upcArtifacts.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upcPrefs.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upcProperties.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upcWizards.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upc_editorAndArtifacts.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upc_editorVsArtifacts.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upc_template1.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upc_template2.png tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/welcomeC-pldt.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/welcomeOverview.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/html/mpiTemplates.html tools/pldt/org.eclipse.ptp.pldt.doc.user/html/openMPextra.html tools/pldt/org.eclipse.ptp.pldt.doc.user/html/overview.html tools/pldt/org.eclipse.ptp.pldt.doc.user/html/run.html tools/pldt/org.eclipse.ptp.pldt.doc.user/html/runOMP.html tools/pldt/org.eclipse.ptp.pldt.doc.user/html/samples/helloMPI_c_style.cpp tools/pldt/org.eclipse.ptp.pldt.doc.user/html/samples/pi.cpp tools/pldt/org.eclipse.ptp.pldt.doc.user/html/samples/testMPI.c tools/pldt/org.eclipse.ptp.pldt.doc.user/html/samples/testMPIbarrier.c tools/pldt/org.eclipse.ptp.pldt.doc.user/html/samples/testMPIcpp.cpp tools/pldt/org.eclipse.ptp.pldt.doc.user/html/setup.html tools/pldt/org.eclipse.ptp.pldt.doc.user/html/setupMakefileProject.html tools/pldt/org.eclipse.ptp.pldt.doc.user/html/setupOMP.html tools/pldt/org.eclipse.ptp.pldt.doc.user/html/thumb.js tools/pldt/org.eclipse.ptp.pldt.doc.user/html/toc.html tools/pldt/org.eclipse.ptp.pldt.doc.user/html/tracing.html tools/pldt/org.eclipse.ptp.pldt.doc.user/html/upc.html tools/pldt/org.eclipse.ptp.pldt.doc.user/html/upc_wizards.html tools/pldt/org.eclipse.ptp.pldt.doc.user/html/whatsnew.html tools/pldt/org.eclipse.ptp.pldt.doc.user/icons/analyze.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/css/graphics/.cvsignore tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/css/graphics/cdt_icon_create_cproject.png tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/css/graphics/sample.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/css/graphics/sample_hov.gif tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/css/sample.css tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/pldtOverview.xml tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/pldtTutorial.xml tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/pldtWhatsnew.xml tools/pldt/org.eclipse.ptp.pldt.doc.user/plugin.properties tools/pldt/org.eclipse.ptp.pldt.doc.user/plugin.xml tools/pldt/org.eclipse.ptp.pldt.doc.user/toc.xml tools/pldt/org.eclipse.ptp.pldt.lapi/.classpath tools/pldt/org.eclipse.ptp.pldt.lapi/.cvsignore tools/pldt/org.eclipse.ptp.pldt.lapi/.project tools/pldt/org.eclipse.ptp.pldt.lapi/.settings/org.eclipse.jdt.core.prefs tools/pldt/org.eclipse.ptp.pldt.lapi/META-INF/MANIFEST.MF tools/pldt/org.eclipse.ptp.pldt.lapi/about.html tools/pldt/org.eclipse.ptp.pldt.lapi/about.ini tools/pldt/org.eclipse.ptp.pldt.lapi/about.mappings tools/pldt/org.eclipse.ptp.pldt.lapi/about.properties tools/pldt/org.eclipse.ptp.pldt.lapi/build.properties tools/pldt/org.eclipse.ptp.pldt.lapi/eclipse32.png tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Addr_get.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Addr_set.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Address.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Address_init.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Address_init64.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Amsend.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Amsendv.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Fence.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Get.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Getcntr.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Getv.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Gfence.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Init.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Msg_string.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Msgpoll.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Nopoll_wait.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Probe.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Purge_totask.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Put.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Putv.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Qenv.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Resume_totask.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Rmw.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Rmw64.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Senv.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Setcntr.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Setcntr_wstatus.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Term.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Util.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Waitcntr.html tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Xfer.html tools/pldt/org.eclipse.ptp.pldt.lapi/icons/.cvsignore tools/pldt/org.eclipse.ptp.pldt.lapi/icons/lapi.gif tools/pldt/org.eclipse.ptp.pldt.lapi/plugin.properties tools/pldt/org.eclipse.ptp.pldt.lapi/plugin.xml tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/LAPIArtifactMarkingVisitor.java tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/LapiIDs.java tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/LapiPlugin.java tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/actions/RunAnalyseLAPIcommandHandler.java tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/analysis/LapiCASTVisitor.java tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/editorHelp/LapiCHelpBook.java tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/editorHelp/LapiCHelpInfoProvider.java tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/messages/Messages.java tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/messages/messages.properties tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/prefs/LAPIPreferencePage.java tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/views/LapiArtifactView.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/.classpath tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/.project tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/.settings/org.eclipse.jdt.core.prefs tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/META-INF/MANIFEST.MF tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/about.html tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/build.properties tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/plugin.properties tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/Activator.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/GraphCreator.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/IBlock.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/ICallGraph.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/ICallGraphNode.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/IControlFlowGraph.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/impl/Block.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/impl/CallGraph.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/impl/CallGraphNode.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/impl/ControlFlowGraph.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/impl/ResourceCollector.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/.classpath tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/.project tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/.settings/org.eclipse.jdt.core.prefs tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/META-INF/MANIFEST.MF tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/about.html tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/build.properties tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/icons/barrier.gif tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/icons/collapseall.gif tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/icons/expandall.gif tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/plugin.properties tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/plugin.xml tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/Activator.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/IDs.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/actions/MPIAnalysisManager.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/actions/RunAnalyseMPIAnalysiscommandHandler.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/BarrierCFG.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/BarrierCFGBlock.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/BarrierExpression.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/BarrierTable.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/GotoEliminator.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIBarrierAnalysisResults.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIBarrierExpr.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIBarrierExprModified.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIBarrierMatching.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIBlock.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPICFGBuilder.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPICallGraph.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPICallGraphNode.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIControlFlowGraph.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIDUChain.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIMVAnalysis.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIResourceCollector.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPISSA.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPISingleAssignAnalysis.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/UseDefBuilder.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/Util.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/messages/Messages.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/messages/messages.properties tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/popup/actions/ShowMatchSet.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/ArtifactWithParent.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/BarrierArtifacts.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/MPIArtifactMarkingVisitor.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/MPIBarrierMatchingSetView.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/MPIBarrierView.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/MPIErrorView.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/MatchingSet.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/ShowErrors.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/SimpleTableBarrierView.java tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/SimpleTreeTableMarkerView.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/.classpath tools/pldt/org.eclipse.ptp.pldt.mpi.core/.cvsignore tools/pldt/org.eclipse.ptp.pldt.mpi.core/.project tools/pldt/org.eclipse.ptp.pldt.mpi.core/.settings/org.eclipse.jdt.core.prefs tools/pldt/org.eclipse.ptp.pldt.mpi.core/META-INF/MANIFEST.MF tools/pldt/org.eclipse.ptp.pldt.mpi.core/about.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/build.properties tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Abort.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Accumulate.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Add_error_class.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Add_error_code.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Add_error_string.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Address.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Allgather.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Allgatherv.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Alloc_mem.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Allreduce.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Alltoall.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Alltoallv.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Alltoallw.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Attr_delete.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Attr_get.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Attr_put.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Barrier.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Bcast.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Bsend.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Bsend_init.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Buffer_attach.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Buffer_detach.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cancel.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_coords.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_create.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_get.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_map.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_rank.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_shift.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_sub.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cartdim_get.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_c2f.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_call_errhandler.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_compare.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_create.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_create_errhandler.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_create_keyval.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_delete_attr.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_dup.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_f2c.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_free.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_free_keyval.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_get_attr.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_get_errhandler.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_get_name.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_group.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_rank.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_remote_group.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_remote_size.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_set_attr.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_set_errhandler.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_set_name.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_size.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_split.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_test_inter.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Dims_create.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Errhandler_create.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Errhandler_free.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Errhandler_get.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Errhandler_set.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Error_class.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Error_string.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Exscan.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_c2f.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_call_errhandler.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_create_errhandler.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_f2c.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_get_errhandler.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_set_errhandler.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Finalize.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Finalized.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Free_mem.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Gather.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Gatherv.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get_address.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get_count.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get_elements.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get_processor_name.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get_version.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graph_create.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graph_get.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graph_map.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graph_neighbors.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graph_neighbors_count.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graphdims_get.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Grequest_complete.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Grequest_start.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_c2f.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_compare.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_difference.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_excl.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_f2c.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_free.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_incl.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_intersection.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_range_excl.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_range_incl.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_rank.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_size.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_union.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Ibsend.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_c2f.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_create.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_delete.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_dup.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_f2c.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_free.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_get.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_get_nkeys.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_get_nthkey.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_get_valuelen.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_set.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Init.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Init_thread.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Initialized.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Intercomm_create.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Intercomm_merge.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Iprobe.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Irecv.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Irsend.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Is_thread_main.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Isend.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Issend.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Keyval_create.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Keyval_free.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Op_c2f.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Op_create.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Op_f2c.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Op_free.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Pack.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Pack_external.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Pack_external_size.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Pack_size.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Pcontrol.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Probe.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Put.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Query_thread.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Recv.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Recv_init.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Reduce.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Reduce_scatter.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Request_c2f.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Request_f2c.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Request_free.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Request_get_status.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Rsend.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Rsend_init.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Scan.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Scatter.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Scatterv.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Send.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Send_init.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Sendrecv.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Sendrecv_replace.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Ssend.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Ssend_init.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Start.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Startall.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Status_c2f.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Status_f2c.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Status_set_cancelled.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Status_set_elements.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Test.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Test_cancelled.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Testall.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Testany.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Testsome.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Topo_test.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_c2f.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_commit.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_contiguous.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_darray.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_f90_complex.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_f90_integer.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_f90_real.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_hindexed.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_hvector.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_indexed_block.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_keyval.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_resized.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_struct.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_subarray.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_delete_attr.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_dup.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_extent.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_f2c.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_free.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_free_keyval.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_attr.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_contents.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_envelope.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_extent.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_name.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_true_extent.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_hindexed.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_hvector.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_indexed.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_lb.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_match_size.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_set_attr.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_set_name.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_size.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_struct.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_ub.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_vector.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Unpack.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Unpack_external.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Wait.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Waitall.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Waitany.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Waitsome.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_c2f.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_call_errhandler.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_complete.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_create.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_create_errhandler.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_create_keyval.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_delete_attr.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_f2c.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_fence.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_free.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_free_keyval.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_attr.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_errhandler.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_group.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_name.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_lock.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_post.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_set_attr.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_set_errhandler.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_set_name.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_start.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_test.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_unlock.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_wait.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Wtick.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Wtime.html tools/pldt/org.eclipse.ptp.pldt.mpi.core/icons/.cvsignore tools/pldt/org.eclipse.ptp.pldt.mpi.core/icons/mpi.gif tools/pldt/org.eclipse.ptp.pldt.mpi.core/mpiref.xml tools/pldt/org.eclipse.ptp.pldt.mpi.core/plugin.properties tools/pldt/org.eclipse.ptp.pldt.mpi.core/plugin.xml tools/pldt/org.eclipse.ptp.pldt.mpi.core/samples/testMPI.c tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MPIArtifactMarkingVisitor.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/Messages.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MpiArtifactManager.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MpiIDs.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MpiPlugin.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/actions/AnalyseMPIFortranHandler.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/actions/RunAnalyseMPIcommandHandler.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/analysis/MpiCASTVisitor.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/analysis/MpiCPPASTVisitor.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/analysis/MpiFortranASTVisitor.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MPIDocXMLParser.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCHelpBook.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCHelpProvider.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCPPHelpBook.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCPPHelpProvider.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/messages.properties tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/prefs/MPIPreferenceInitializer.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/prefs/MPIPreferencePage.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/views/MPITableView.java tools/pldt/org.eclipse.ptp.pldt.mpi.core/templates/mpi_templates.xml tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/.classpath tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/.cvsignore tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/.project tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/.settings/org.eclipse.jdt.core.prefs tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/META-INF/MANIFEST.MF tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/about.html tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/build.properties tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/plugin.properties tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/plugin.xml tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPAnalysisException.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPAnalysisManager.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPError.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPErrorManager.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMpIDs.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTElif.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTElse.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTEndif.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTError.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTFactory.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTFunctionMacro.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTIf.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTIfdef.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTIfndef.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTInclusionStatement.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTNode.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTOMPFactory.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTOMPPragma.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTObjectMacro.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTPragma.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTUndef.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/dictionary/Dictionary.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/dictionary/DictionaryFactory.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/dictionary/Symbol.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/internal/core/OpenMpIDs.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPBasicBlock.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPCFG.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPCFGNode.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPDFS.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPExpressionBlock.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPPragmaNode.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/FileConcurrencyAnalysis.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/FileStatementMap.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/FunctionConcurrencyAnalysis.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/OMPCFGMaker.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/OMPCFGResult.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/PASTSemanticCheck.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/PhaseAnalysisFactory.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/PhaseConcurrencyAnalysis.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/RegionConcurrencyAnalysis.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/RegionConcurrencyMap.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/StatementMap.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/parser/OpenMPKeywords.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/parser/OpenMPScanner.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/parser/OpenMPToken.java tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/textview/ShowConcurrencyAction.java tools/pldt/org.eclipse.ptp.pldt.openmp.core/.classpath tools/pldt/org.eclipse.ptp.pldt.openmp.core/.cvsignore tools/pldt/org.eclipse.ptp.pldt.openmp.core/.project tools/pldt/org.eclipse.ptp.pldt.openmp.core/.settings/org.eclipse.jdt.core.prefs tools/pldt/org.eclipse.ptp.pldt.openmp.core/META-INF/MANIFEST.MF tools/pldt/org.eclipse.ptp.pldt.openmp.core/about.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/build.properties tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/get_num_procs.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/get_thread_num.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_destroy_lock.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_destroy_nest_lock.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_dynamic.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_max_threads.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_nested.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_num_threads.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_wtick.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_wtime.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_in_parallel.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_init_lock.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_init_nest_lock.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_dynamic.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_lock.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_nest_lock.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_nested.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_num_threads.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_test_lock.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_test_nest_lock.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_unset_lock.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_unset_nest_lock.html tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/.cvsignore tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/noOpenMP.gif tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/openMP.gif tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/openMPerr.gif tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/openMPproblem.gif tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/problem.gif tools/pldt/org.eclipse.ptp.pldt.openmp.core/include/omptest.h tools/pldt/org.eclipse.ptp.pldt.openmp.core/plugin.properties tools/pldt/org.eclipse.ptp.pldt.openmp.core/plugin.xml tools/pldt/org.eclipse.ptp.pldt.openmp.core/samples/CFile.c tools/pldt/org.eclipse.ptp.pldt.openmp.core/samples/testOpenMP.c tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPArtifactMarkingVisitor.java tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPIDs.java tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPPlugin.java tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPScanReturn.java tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/actions/AnalyseOpenMPFortranHandler.java tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/actions/RunAnalyseOpenMPcommandHandler.java tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/analysis/OpenMPCASTVisitor.java tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/analysis/OpenMPFortranASTVisitor.java tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/editorHelp/Messages.java tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/editorHelp/OpenMPCHelpBook.java tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/editorHelp/OpenMPCHelpProvider.java tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/editorHelp/messages.properties tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/messages/Messages.java tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/messages/messages.properties tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/prefs/OpenMPPreferenceInitializer.java tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/prefs/OpenMPPreferencePage.java tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/views/OpenMPArtifactView.java tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/internal/core/OpenMPIDs.java tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/.classpath tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/.cvsignore tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/.project tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/.settings/org.eclipse.jdt.core.prefs tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/META-INF/MANIFEST.MF tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/about.html tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/build.properties tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/icons/openMPproblem.gif tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/plugin.properties tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/plugin.xml tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/PvPlugin.java tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/messages/Messages.java tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/messages/messages.properties tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/views/OpenMPProblemsView.java tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/views/ProblemMarkerAttrIds.java tools/pldt/org.eclipse.ptp.pldt.upc/.classpath tools/pldt/org.eclipse.ptp.pldt.upc/.cvsignore tools/pldt/org.eclipse.ptp.pldt.upc/.project tools/pldt/org.eclipse.ptp.pldt.upc/.settings/org.eclipse.jdt.core.prefs tools/pldt/org.eclipse.ptp.pldt.upc/META-INF/MANIFEST.MF tools/pldt/org.eclipse.ptp.pldt.upc/about.html tools/pldt/org.eclipse.ptp.pldt.upc/build.properties tools/pldt/org.eclipse.ptp.pldt.upc/html/id_MYTHREAD.html tools/pldt/org.eclipse.ptp.pldt.upc/html/id_THREADS.html tools/pldt/org.eclipse.ptp.pldt.upc/html/id_UPC_MAX_BLOCK_SIZE.html tools/pldt/org.eclipse.ptp.pldt.upc/html/index.html tools/pldt/org.eclipse.ptp.pldt.upc/html/keywords.html tools/pldt/org.eclipse.ptp.pldt.upc/html/shared.html tools/pldt/org.eclipse.ptp.pldt.upc/html/terms.html tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_addrfield.html tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_affinitysize.html tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_alloc.html tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_broadcast.html tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_exchange.html tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_gather.html tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_gather_all.html tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_lock_alloc.html tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_permute.html tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_scatter.html tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_alloc.html tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_free.html tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_alloc.html tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_exit.html tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_lock_alloc.html tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_local_alloc.html tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock.html tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_attempt.html tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_free.html tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_t.html tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memcpy.html tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memget.html tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memset.html tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_phaseof.html tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_resetphase.html tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_threadof.html tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_unlock.html tools/pldt/org.eclipse.ptp.pldt.upc/icons/.cvsignore tools/pldt/org.eclipse.ptp.pldt.upc/icons/upc.gif tools/pldt/org.eclipse.ptp.pldt.upc/plugin.properties tools/pldt/org.eclipse.ptp.pldt.upc/plugin.xml tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCArtifactMarkingVisitor.java tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCIDs.java tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCPlugin.java tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/actions/RunAnalyseUPCcommandHandler.java tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/analysis/UPCCASTVisitor.java tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/editorHelp/UPCCHelpBook.java tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/editorHelp/UPCCHelpInfoProvider.java tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/messages/Messages.java tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/messages/messages.properties tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/prefs/UPCPreferenceInitializer.java tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/prefs/UPCPreferencePage.java tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/views/UPCArtifactView.java tools/pldt/org.eclipse.ptp.pldt.upc/templates/upc_templates.xml tools/pldt/org.eclipse.ptp.pldt.wizards/.classpath tools/pldt/org.eclipse.ptp.pldt.wizards/.cvsignore tools/pldt/org.eclipse.ptp.pldt.wizards/.project tools/pldt/org.eclipse.ptp.pldt.wizards/.settings/org.eclipse.jdt.core.prefs tools/pldt/org.eclipse.ptp.pldt.wizards/META-INF/MANIFEST.MF tools/pldt/org.eclipse.ptp.pldt.wizards/about.html tools/pldt/org.eclipse.ptp.pldt.wizards/build.properties tools/pldt/org.eclipse.ptp.pldt.wizards/plugin.properties tools/pldt/org.eclipse.ptp.pldt.wizards/plugin.xml tools/pldt/org.eclipse.ptp.pldt.wizards/samples/testMPI.c tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/MpiWizardsPlugin.java tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/messages/Messages.java tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/messages/messages.properties tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/AbstractProjectWizardPage.java tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcess.java tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcessCPP.java tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcessPages.java tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcessPagesCPP.java tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectWizardPage.java tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectWizardPageC.java tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectWizardPageCPP.java tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/OpenMPProjectProcess.java tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/OpenMPProjectProcessPages.java tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/OpenMPProjectWizardPage.java tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIemptyCproject/template.xml tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIhelloWorldCproject/src/Basename.c tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIhelloWorldCproject/template.properties tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIhelloWorldCproject/template.xml tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCPPproject/src/Basename.cpp tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCPPproject/template.properties tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCPPproject/template.xml tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCproject/src/Basename.c tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCproject/template.properties tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCproject/template.xml tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPemptyCproject/template.xml tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/src/Basename.c tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/src/testOpenMP.c tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/template.properties tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/template.xml tools/remotetools/org.eclipse.ptp.remotetools.core/.classpath tools/remotetools/org.eclipse.ptp.remotetools.core/.project tools/remotetools/org.eclipse.ptp.remotetools.core/.settings/org.eclipse.jdt.core.prefs tools/remotetools/org.eclipse.ptp.remotetools.core/META-INF/MANIFEST.MF tools/remotetools/org.eclipse.ptp.remotetools.core/about.html tools/remotetools/org.eclipse.ptp.remotetools.core/about.ini tools/remotetools/org.eclipse.ptp.remotetools.core/about.mappings tools/remotetools/org.eclipse.ptp.remotetools.core/about.properties tools/remotetools/org.eclipse.ptp.remotetools.core/build.properties tools/remotetools/org.eclipse.ptp.remotetools.core/eclipse32.png tools/remotetools/org.eclipse.ptp.remotetools.core/plugin.properties tools/remotetools/org.eclipse.ptp.remotetools.core/plugin.xml tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/RemotetoolsPlugin.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/AuthToken.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/ILocalPortForwarding.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IPortForwarding.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteConnection.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteCopyTools.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteDownloadExecution.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteExecutionManager.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteExecutionTools.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteFileEnumeration.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteFileTools.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteItem.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteOperation.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemotePathTools.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemotePortForwarding.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemotePortForwardingTools.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteScript.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteScriptExecution.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteStatusTools.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteTunnel.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteUploadExecution.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/KeyAuthToken.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/PasswdAuthToken.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/RemoteProcess.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/messages/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/messages/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/CancelException.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/LocalPortBoundException.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/PortForwardingException.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteConnectionException.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteException.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteExecutionException.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteOperationException.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/AbstractRemoteExecution.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/Debug.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/RemoteScript.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/RemoteTunnel.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/core/Connection.properties tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/core/ConnectionProperties.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/CipherTypes.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/CipherTypesMessages.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/Connection.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ConnectionLocks.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ControlChannel.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/CopyTools.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/DownloadExecution.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ExecutionManager.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ExecutionObserver.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ExecutionTools.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/FileTools.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/KillableExecution.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/PathTools.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/PortForwardingTools.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RegexFileNameFilter.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteFileAttributes.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteFileEnumeration.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteFileRecursiveEnumeration.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteItem.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemotePortForwarding.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemotePortForwardingPool.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/SSHRemoteProcess.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ScriptExecution.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/StatusTools.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/UploadExecution.java tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ciphertypesmessages.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.core/.classpath tools/remotetools/org.eclipse.ptp.remotetools.environment.core/.project tools/remotetools/org.eclipse.ptp.remotetools.environment.core/.settings/org.eclipse.jdt.core.prefs tools/remotetools/org.eclipse.ptp.remotetools.environment.core/META-INF/MANIFEST.MF tools/remotetools/org.eclipse.ptp.remotetools.environment.core/about.html tools/remotetools/org.eclipse.ptp.remotetools.environment.core/build.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.core/plugin.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.core/plugin.xml tools/remotetools/org.eclipse.ptp.remotetools.environment.core/schema/childrenProvider.exsd tools/remotetools/org.eclipse.ptp.remotetools.environment.core/schema/remoteEnvironmentControlDelegate.exsd tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/EnvironmentPlugin.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControl.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControlEventListener.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControlEventProvider.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControlJobListener.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetJob.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetStatus.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/PoolingTargetControlEventProvider.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/SSHTargetControl.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/TargetControlledJob.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ChildrenProviderManager.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetElement.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetElementStatus.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetEnvironmentEventListener.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetEventListener.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetElement.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetEnvironmentEventManager.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetEnvironmentManager.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetTypeElement.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/messages/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/messages/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/IChildrenProvider.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/INode.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/ITargetTypeExtension.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/ITargetVariables.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/AbstractEnvironmentDialogPage.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/DialogMessages.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/DialogMessages.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/EnvironmentWizard.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/AttributeVerification.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/ControlAttributes.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/IllegalAttributeException.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/.classpath tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/.project tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/.settings/org.eclipse.jdt.core.prefs tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/META-INF/MANIFEST.MF tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/about.html tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/build.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/plugin.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/plugin.xml tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/Activator.java tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/AttributeNames.java tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/DefaultValues.java tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/attribute_names.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/defaults.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/ConfigFactory.java tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/Environment.java tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/TargetConfig.java tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/TargetControl.java tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/messages/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/messages/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/preferences/ui/PreferenceInitializer.java tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/preferences/ui/PreferencePage.java tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/ui/ConfigurationPage.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/.classpath tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/.project tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/.settings/org.eclipse.jdt.core.prefs tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/META-INF/MANIFEST.MF tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/about.html tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/build.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/iprocess.gif tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/iprocess.png tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/sync.png tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/target.png tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/plugin.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/plugin.xml tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/schema/launchConfigurationMacroSupplier.exsd tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/schema/launcherObserver.exsd tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/RemoteLauncherPlugin.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchIntegration.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchObserver.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchProcess.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchProgressListener.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/IRemoteLaunchAttributes.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/IRemoteLaunchErrors.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/LinuxPath.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/NullLaunchIntegration.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/RemoteLaunchDelegate.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/DownloadRule.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/ExecutionConfiguration.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/ExecutionResult.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/ISynchronizationRule.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/OverwritePolicies.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/RuleFactory.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/SerializationKeys.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/UploadRule.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/DownloadBackAction.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/DownloadBackRule.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/DownloadRuleAction.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/ILaunchProcessCallback.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/IRuleAction.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/LaunchObserverIterator.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/RemoteLaunchProcess.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/RuleActionFactory.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/UploadRuleAction.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/integration/NullLaunchObserver.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/macros/LaunchMacroSupplier.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/macros/LaunchVariableContextInfo.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/macros/LaunchVariableManager.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/AbstractProcess.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/ExecutionStreamsProxy.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/MonitorOutputStream.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/TargetProcess.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/macros/ILaunchConfigurationVariableSupplier.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/macros/ILaunchVariableContextInfo.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/macros/ILaunchVariableManager.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/LaunchPreferences.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/LauncherPreferencePage.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/PreferenceInitializer.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/launch_preferences.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/DownloadRuleDialog.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/EnhancedSynchronizeTab.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/IRuleDialog.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/LauncherExecutionTab.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/RuleDialogFactory.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/SynchronizationRuleLabelProvider.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/UploadRuleDialog.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/variables/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/variables/RemoteWorkspaceResolver.java tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/variables/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/.classpath tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/.project tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/.settings/org.eclipse.jdt.core.prefs tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/META-INF/MANIFEST.MF tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/about.html tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/build.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/agent_detach_obj.gif tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/connect_create.gif tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/iprocess.gif tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/monitor_obj.gif tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/nglinux.gif tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/resume.gif tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/run_exc.gif tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/sample.gif tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/suspend.gif tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/terminatedlaunch.gif tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/plugin.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/plugin.xml tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/schema/doubleClickHandler.exsd tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/schema/workloadController.exsd tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/UIEnvironmentPlugin.java tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/extension/DoubleClickHandlerManager.java tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/extension/IDoubleClickHandler.java tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/messages/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/messages/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/views/RemoteToolsEnvironmentView.java tools/remotetools/org.eclipse.ptp.remotetools.preferences/.classpath tools/remotetools/org.eclipse.ptp.remotetools.preferences/.project tools/remotetools/org.eclipse.ptp.remotetools.preferences/.settings/org.eclipse.jdt.core.prefs tools/remotetools/org.eclipse.ptp.remotetools.preferences/META-INF/MANIFEST.MF tools/remotetools/org.eclipse.ptp.remotetools.preferences/about.html tools/remotetools/org.eclipse.ptp.remotetools.preferences/build.properties tools/remotetools/org.eclipse.ptp.remotetools.preferences/plugin.properties tools/remotetools/org.eclipse.ptp.remotetools.preferences/plugin.xml tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/PreferencesPlugin.java tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/events/FollowBeginStringFieldEditorPropertyChangeListener.java tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/events/IPreferencesChangeListener.java tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/events/PreferencesChangeEvent.java tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/messages/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/messages/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/AbstractBaseFieldEditorPreferencePage.java tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/AbstractBasicPreferencePage.java tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/LabelFieldEditor.java tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PluginResources.properties tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PreferenceConstants.java tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PreferenceConstantsFromFile.java tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PreferenceInitializer.java tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/SpacerFieldEditor.java tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/TargetEnvironmentPreferencePage.java tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/TargetPreferencePage.java tools/remotetools/org.eclipse.ptp.remotetools.utils/.classpath tools/remotetools/org.eclipse.ptp.remotetools.utils/.project tools/remotetools/org.eclipse.ptp.remotetools.utils/.settings/org.eclipse.jdt.core.prefs tools/remotetools/org.eclipse.ptp.remotetools.utils/META-INF/MANIFEST.MF tools/remotetools/org.eclipse.ptp.remotetools.utils/about.html tools/remotetools/org.eclipse.ptp.remotetools.utils/build.properties tools/remotetools/org.eclipse.ptp.remotetools.utils/plugin.properties tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/UtilsPlugin.java tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/messages/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/messages/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/MacAddress.java tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/MacAddressFormatException.java tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/Messages.java tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/messages.properties tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/ILineStreamListener.java tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/IStreamListener.java tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/ListenedOutputStream.java tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/StreamBridge.java tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/StreamObserver.java tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/TextStreamObserver.java

commit: 6c089fd3db149f7a5e3491110daa6b53e0ae60d7 [log] [tgz]
author: cvs2svn <ptp-dev@eclipse.org> Mon Jun 13 17:30:41 2011 +0000
committer: cvs2svn <ptp-dev@eclipse.org> Mon Jun 13 17:30:41 2011 +0000
tree: 5d38338d52d18bd7c03b4cfa7d02218984ca46d8
parent: d8ba443b3a24e13a9d371a7006861b70de59cb72 [diff]
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 b6a89eb..0000000
--- a/core/org.eclipse.ptp.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.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
-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.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 53747a1..0000000
--- a/core/org.eclipse.ptp.remote.core.tests/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,16 +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"
-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 3e1a5eb..0000000
--- a/core/org.eclipse.ptp.remote.core.tests/src/org/eclipse/ptp/core/tests/FileStoreTests.java
+++ /dev/null

@@ -1,148 +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 java.util.HashMap;
-import java.util.Map;
-
-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);
-		
-		Map<String, String> map = new HashMap<String, String>();
-		map.put("ptp.localhost-selection", "false");
-		map.put("ptp.login-username", USERNAME);
-		map.put("ptp.login-password", PASSWORD);
-		map.put("ptp.connection-address", HOST);
-		map.put("ptp.connection-port", "22");
-		map.put("ptp.key-path", "");
-		map.put("ptp.key-passphrase", "");
-		map.put("ptp.is-passwd-auth", "true");
-		map.put("ptp.connection-timeout", "5");
-		map.put("ptp.cipher-type", "default");
-		
-		try {
-			fRemoteConnection = connMgr.newConnection(CONNECTION_NAME, map);
-		} catch (RemoteConnectionException e) {
-			fail(e.getLocalizedMessage());
-		}
-		assertNotNull(fRemoteConnection);
-		
-		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 4d116d0..0000000
--- a/core/org.eclipse.ptp.remote.core.tests/src/org/eclipse/ptp/core/tests/RemoteConnectionTests.java
+++ /dev/null

@@ -1,164 +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 java.util.HashMap;
-import java.util.Map;
-
-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 = "user"; //$NON-NLS-1$
-	private static final String PASSWORD = "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);
-		
-		Map<String, String> map = new HashMap<String, String>();
-		map.put("ptp.localhost-selection", "false"); //$NON-NLS-1$ //$NON-NLS-2$
-		map.put("ptp.login-username", USERNAME); //$NON-NLS-1$
-		map.put("ptp.login-password", PASSWORD); //$NON-NLS-1$
-		map.put("ptp.connection-address", HOST); //$NON-NLS-1$
-		map.put("ptp.connection-port", "22"); //$NON-NLS-1$ //$NON-NLS-2$
-		map.put("ptp.key-path", ""); //$NON-NLS-1$ //$NON-NLS-2$
-		map.put("ptp.key-passphrase", ""); //$NON-NLS-1$ //$NON-NLS-2$
-		map.put("ptp.is-passwd-auth", "true"); //$NON-NLS-1$ //$NON-NLS-2$
-		map.put("ptp.connection-timeout", "5"); //$NON-NLS-1$ //$NON-NLS-2$
-		map.put("ptp.cipher-type", "default"); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		try {
-			fRemoteConnection = connMgr.newConnection("test_connection", map); //$NON-NLS-1$
-		} catch (RemoteConnectionException e) {
-			fail(e.getLocalizedMessage());
-		}
-		assertNotNull(fRemoteConnection);
-		
-		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 ad393fa..0000000
--- a/core/org.eclipse.ptp.remote.core.tests/src/org/eclipse/ptp/core/tests/RemoteToolsTests.java
+++ /dev/null

@@ -1,185 +0,0 @@
-package org.eclipse.ptp.core.tests;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.ptp.remote.remotetools.core.RemoteToolsServices;
-import org.eclipse.ptp.remote.remotetools.core.environment.PTPTargetControl;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionTools;
-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.core.TargetElement;
-import org.eclipse.ptp.remotetools.environment.core.TargetTypeElement;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteExecutionException;
-
-public class RemoteToolsTests 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 PTPTargetControl fTargetControl;
-	private IRemoteExecutionManager fExecutionManager;
-	private IRemoteExecutionTools fExecutionTools;
-	private TargetTypeElement fTarget;
-	private TargetElement fElement;
-	
-	public void testCopy() {
-		for (int i = 0; i < 50; 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) {
-//			}
-		}
-		
-//		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;
-//			while ((line = br.readLine()) != null) {
-//				System.out.println("read \""+line+"\"");
-//			}
-//		} catch (IOException e) {
-//			fail();
-//		}
-//		try {
-//			p.waitFor();
-//		} catch (InterruptedException e) {
-//		}
-
-	}
-
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	@Override
-	protected void setUp() throws Exception {
-		Map<String, String> map = new HashMap<String, String>();
-		map.put("ptp.localhost-selection", "false"); //$NON-NLS-1$ //$NON-NLS-2$
-		map.put("ptp.login-username", USERNAME); //$NON-NLS-1$
-		map.put("ptp.login-password", PASSWORD); //$NON-NLS-1$
-		map.put("ptp.connection-address", HOST); //$NON-NLS-1$
-		map.put("ptp.connection-port", "22"); //$NON-NLS-1$ //$NON-NLS-2$
-		map.put("ptp.key-path", ""); //$NON-NLS-1$ //$NON-NLS-2$
-		map.put("ptp.key-passphrase", ""); //$NON-NLS-1$ //$NON-NLS-2$
-		map.put("ptp.is-passwd-auth", "true"); //$NON-NLS-1$ //$NON-NLS-2$
-		map.put("ptp.connection-timeout", "5"); //$NON-NLS-1$ //$NON-NLS-2$
-		map.put("ptp.cipher-type", "default"); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		fTarget = RemoteToolsServices.getTargetTypeElement();
-		String id = EnvironmentPlugin.getDefault().getEnvironmentUniqueID();
-		TargetElement element = new TargetElement(fTarget, HOST, map, id);
-		fTarget.addElement(element);
-		fTargetControl = (PTPTargetControl)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/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/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 daf43b5..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 v20100423 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 97d5543..0000000
--- a/releng/org.eclipse.ptp.releng/build.xml
+++ /dev/null

@@ -1,961 +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,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="helios"/>
-		<!-- Update for new PTP branch -->
-		<property name="ptpBranchVersion" value="4.0.8"/>
-		<property name="photranBranchVersion" value="6.0.8"/>
-		<!-- 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/R-3.6.2-201102101200/eclipse-SDK-3.6.2-linux-gtk-x86_64.tar.gz"/>
-		<!-- Update for new CDT version -->
-		<property name="cdtDist" value="/home/data/httpd/download.eclipse.org/tools/cdt/builds/7.0.2/I.I201105041732/cdt-master-7.0.2-I201105041732.zip"/>
-		<!-- Update for new RSE version -->
-		<property name="rseDist" value="/home/data/httpd/download.eclipse.org/dsdp/tm/downloads/drops/R-3.2.1-201009070720/RSE-SDK-3.2.1.zip"/>
-		<!-- Update for new Mylyn version -->
-		<property name="mylynDist" value="/home/data/httpd/download.eclipse.org/tools/mylyn/update/mylyn-3.4.3-e3.4.zip"/>
-		<!-- Update to build against a different branch                  -->
-		<!-- NOTE: master/build.properties will also have to be changed! -->
-		<property name="ptpTagBranch" value="-r ptp_4_0"/>
-		<property name="photranTagBranch" value="-r ptp_4_0"/>
-		<!-- 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="releaseDir" value="/home/data/httpd/download.eclipse.org/tools/ptp/builds/${eclipseRelease}"/>
-		<property name="copyToDir" value="${releaseDir}/${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="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"/>
-	</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>
-		<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"/>
-
-		<!-- 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 -->
-		<delete file="${releaseDir}/latest" followsymlinks="false" failonerror="false"/>
-		<!--symlink action="delete" link="${copyToDir}/latest" failonerror="false"/-->
-		<symlink link="${releaseDir}/latest" resource="${copyToDir}" overwrite="true"/>
-		<delete file="${releaseDir}/ptp-master-${ptpBranchVersion}-latest.zip" followsymlinks="false" failonerror="false"/>
-		<!--symlink action="delete" link="${copyToDir}/ptp-master-${ptpBranchVersion}-latest.zip" failonerror="false"/-->
-		<symlink link="${releaseDir}/ptp-master-${ptpBranchVersion}-latest.zip" resource="${copyToDir}/${masterFile}" overwrite="true"/>
-		<delete file="${releaseDir}/rdt-server-unix-${ptpBranchVersion}-latest.tar" followsymlinks="false" failonerror="false"/>
-		<!--symlink action="delete" link="${copyToDir}/rdt-server-unix-${ptpBranchVersion}-latest.tar" failonerror="false"/-->
-		<symlink link="${releaseDir}/rdt-server-unix-${ptpBranchVersion}-latest.tar" resource="${copyToDir}/rdt-server-unix-${ptpBranchVersion}.tar" overwrite="true"/>
-		<symlink link="${releaseDir}/rdt-server-aix-${ptpBranchVersion}-latest.tar" resource="${copyToDir}/rdt-server-aix-${ptpBranchVersion}.tar" overwrite="true"/>
-	</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>
-		
-		<!-- 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="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.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.rm.pbs-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.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.remotejars-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.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>		
-		
-		<!--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.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.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.pbs.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.pbs.jproxy"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.pbs.help"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.pbs.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.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/org.eclipse.ptp.remotetools.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.generichost"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.launcher"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.ui"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.preferences"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/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/tools/org.eclipse.ptp.pldt.common"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.doc.user"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.lapi"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.analysis"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>			
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.analysis.cdt"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.analysis"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.ui.pv"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.upc"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/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/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.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/buildsite.xml b/releng/org.eclipse.ptp.releng/buildsite.xml
deleted file mode 100644
index e51a125..0000000
--- a/releng/org.eclipse.ptp.releng/buildsite.xml
+++ /dev/null

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <description url="http://download.eclipse.org/tools/ptp/updates/helios">
-      Parallel Tools Platform Helios 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.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.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.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.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 19496b2..0000000
--- a/releng/org.eclipse.ptp.releng/maps/ptp.map
+++ /dev/null

@@ -1,167 +0,0 @@
-! The master
-feature@org.eclipse.ptp.master=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.master
-
-! PTP features
-feature@org.eclipse.ptp=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp-feature
-feature@org.eclipse.ptp.utils=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.utils-feature
-feature@org.eclipse.ptp.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.core-feature
-feature@org.eclipse.ptp.remote=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.remote-feature
-feature@org.eclipse.ptp.remote.remotetools=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.remote.remotetools-feature
-feature@org.eclipse.ptp.remote.rse=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.remote.rse-feature
-feature@org.eclipse.ptp.remotetools=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.remotetools-feature
-feature@org.eclipse.ptp.rm.ibm.ll=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rm.ibm.ll-feature
-feature@org.eclipse.ptp.rm.ibm.pe=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rm.ibm.pe-feature
-feature@org.eclipse.ptp.rm.mpich2=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rm.mpich2-feature
-feature@org.eclipse.ptp.rm.openmpi=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rm.openmpi-feature
-feature@org.eclipse.ptp.rm.pbs=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rm.pbs-feature
-feature@org.eclipse.ptp.rm.slurm=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rm.slurm-feature
-feature@org.eclipse.ptp.external=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.external-feature
-feature@org.eclipse.ptp.debug.sdm=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.sdm-feature
-feature@org.eclipse.ptp.services=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.services-feature
-
-! PLDT features
-feature@org.eclipse.ptp.pldt=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.pldt-feature
-feature@org.eclipse.ptp.pldt.lapi=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.pldt.lapi-feature
-feature@org.eclipse.ptp.pldt.upc=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.pldt.upc-feature
-
-! 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.remotejars=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rdt.remotejars-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
-
-! 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.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.mpi.mpich2.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.mpich2.core
-plugin@org.eclipse.ptp.rm.mpi.mpich2.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.mpich2.ui
-plugin@org.eclipse.ptp.rm.mpi.openmpi.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.openmpi.core
-plugin@org.eclipse.ptp.rm.mpi.openmpi.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.openmpi.ui
-plugin@org.eclipse.ptp.rm.pbs.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.pbs.core
-plugin@org.eclipse.ptp.rm.pbs.help=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.pbs.help
-plugin@org.eclipse.ptp.rm.pbs.jproxy=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.pbs.jproxy
-plugin@org.eclipse.ptp.rm.pbs.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.pbs.ui
-plugin@org.eclipse.ptp.rm.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.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
-
-! Services Plugins
-plugin@org.eclipse.ptp.services.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.services.core
-plugin@org.eclipse.ptp.services.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.services.ui
-
-! Remote Tools Plugins
-plugin@org.eclipse.ptp.remotetools.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.core
-plugin@org.eclipse.ptp.remotetools.environment.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.core
-plugin@org.eclipse.ptp.remotetools.environment.generichost=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.generichost
-plugin@org.eclipse.ptp.remotetools.environment.launcher=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.launcher
-plugin@org.eclipse.ptp.remotetools.environment.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.ui
-plugin@org.eclipse.ptp.remotetools.preferences=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.preferences
-plugin@org.eclipse.ptp.remotetools.utils=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.utils
-
-! PLDT Plugins
-plugin@org.eclipse.ptp.pldt.common=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.common
-plugin@org.eclipse.ptp.pldt.doc.user=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.doc.user
-plugin@org.eclipse.ptp.pldt.lapi=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.lapi
-plugin@org.eclipse.ptp.pldt.mpi.analysis=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.analysis
-plugin@org.eclipse.ptp.pldt.mpi.analysis.cdt=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.analysis.cdt
-plugin@org.eclipse.ptp.pldt.mpi.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.core
-plugin@org.eclipse.ptp.pldt.openmp.analysis=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.analysis
-plugin@org.eclipse.ptp.pldt.openmp.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.core
-plugin@org.eclipse.ptp.pldt.openmp.ui.pv=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.ui.pv
-plugin@org.eclipse.ptp.pldt.upc=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.upc
-plugin@org.eclipse.ptp.pldt.wizards=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.wizards
-
-! ETF Plugins
-plugin@org.eclipse.ptp.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
-
-! 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
-
-! 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
-

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 eabac83..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=ptp_4_0
-
-# 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=ptp_4_0
-photranTag=ptp_4_0
-
-############## 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 373c1b8..0000000
--- a/releng/org.eclipse.ptp.releng/ptpbuild
+++ /dev/null

@@ -1,67 +0,0 @@
-#!/bin/sh
-#
-# ptpbuild wrapper script
-#
-# Usage: ptpbuild [-t tag] [-d build_dir] [build_args]
-#
-# where
-#
-# tag is the CVS tag used to check out the releng project (default HEAD)
-# build_dir is the location that the build will take place
-# build_args are any arguments you want to pass to the build script
-#
-# set up anything environment specific that needs to be done before
-# launching the build script in the releng project
-
-LANG=en_US
-TAG=HEAD
-CDT_TAG=HEAD
-
-# main staging directory
-BUILD_DIR=/opt/public/download-staging.priv/tools/ptp/releng
-
-args=`getopt c:d:t: $*`
-
-if [ $? != 0 ]; then
-	echo "usage: ptpbuild [-t tag] [-c cdt_tag] [-d build_dir] [build_args]"
-	exit 1
-fi
-
-set -- $args
-for i
-do
-	case "$i"
-	in
-	-c) CDT_TAG="$2"; shift; shift;;
-	-d) BUILD_DIR="$2"; shift; shift;;
-	-t) TAG="$2"; shift; shift;;
-	--) shift; break;;
-	esac
-done
-
-BUILD_LOG=$BUILD_DIR/ptpbuild_${TAG}_`date +%Y%m%d%H%M`.log
-
-touch $BUILD_LOG
-chmod a+r $BUILD_LOG
-
-{
-# create the releng staging directory and go there
-mkdir -p $BUILD_DIR && cd $BUILD_DIR
-
-# remove the old build
-rm -fr org.eclipse.ptp_${TAG}
-
-# Check out the releng project
-cvs -d /cvsroot/tools co -r $TAG -d org.eclipse.ptp_${TAG} org.eclipse.ptp/releng/org.eclipse.ptp.releng
-
-# run the main script
-cd org.eclipse.ptp_${TAG}
-sh build.sh $*
-
-} >$BUILD_LOG 2>&1
-
-if grep -q 'BUILD FAILED' $BUILD_LOG; then
-	echo "BUILD FAILED. See $BUILD_LOG for details."
-fi
-
-exit 0

diff --git a/releng/org.eclipse.ptp.releng/update_versions b/releng/org.eclipse.ptp.releng/update_versions
deleted file mode 100644
index f923a61..0000000
--- a/releng/org.eclipse.ptp.releng/update_versions
+++ /dev/null

@@ -1,119 +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.rdt-feature \
-	org.eclipse.ptp.rdt.remotejars-feature \
-	org.eclipse.ptp.rdt.remotetools-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.mpich2-feature \
-	org.eclipse.ptp.rm.openmpi-feature \
-	org.eclipse.ptp.rm.pbs-feature \
-	org.eclipse.ptp.rm.slurm-feature \
-	org.eclipse.ptp.sci-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.utils"
-	
-update_feature() {
-	sed -e "s/version=\"[0-9]\.[0-9]\.[0-9]\.qualifier\"/version=\"$2\.qualifier\"/" < $1/feature.xml > $TMP_DIR/${1}_feature.xml
-	mv $TMP_DIR/${1}_feature.xml $1/feature.xml
-}
-
-update_manifest() {
-	sed -e "s/Bundle-Version: *[0-9]\.[0-9]\.[0-9]\.qualifier/Bundle-Version: $2.qualifier/" < $1/META-INF/MANIFEST.MF > $TMP_DIR/${1}_MANIFEST.MF
-	mv $TMP_DIR/${1}_MANIFEST.MF $1/META-INF/MANIFEST.MF
-}
-
-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/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 f6603e2..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: 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 0d3d3a7..0000000
--- a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/build.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               icons/

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 a4fe36b..0000000
--- a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/plugin.xml
+++ /dev/null

@@ -1,73 +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_view.gif"
-                  tooltip="Show ETFw Feedback view for selected XML file"
-                  id="org.eclipse.ptp.etfw.feedback.actions.toolbars.sampleCommand">
-            </command>
-         </toolbar>
-      </menuContribution>
-   </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 6bb582f..0000000
--- a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/Activator.java
+++ /dev/null

@@ -1,74 +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.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 ad21c96..0000000
--- a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/SampleFeedbackItem.java
+++ /dev/null

@@ -1,122 +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 java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.ptp.etfw.feedback.FeedbackIDs;
-import org.eclipse.ptp.etfw.feedback.obj.IFeedbackItem;
-
-/**
- * @author Beth Tibbitts
- *
- */
-public class SampleFeedbackItem 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 d42585c..0000000
--- a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/SampleFeedbackParser.java
+++ /dev/null

@@ -1,182 +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 java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.parsers.DocumentBuilder;
-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.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;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.etfw.feedback.obj.IFeedbackParser#getFeedbackItems()
-	 */
-	public IFeedbackItem[] getFeedbackItems() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public List<IFeedbackItem> getFeedbackItems(IFile file) {
-		if(traceOn)System.out.println("Reading xml file: "+file.getLocation());
-		String xmlfile = file.getLocation().toOSString();
-		List<IFeedbackItem> items=new ArrayList<IFeedbackItem>();
-		try {
-			items=parse(xmlfile);
-		} 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;
-	}
-
-	public void setFile(IFile file) {
-		System.out.println("not used!");
-		
-	}
-
-	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;
-	}
-
-	public void setFile(File file) {
-		System.out.println("not used!");
-		
-	}
-
-	/**
-	 * 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(String xmlfile)
-	  throws ParserConfigurationException, SAXException, 
-	  IOException, XPathExpressionException {
-	      
-		  DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance();
-		  domFactory.setNamespaceAware(true); // never forget this!
-	      Document document = null;
-	      DocumentBuilder builder = domFactory.newDocumentBuilder();
-	
-	      File file = new File(xmlfile);
-	      if(!file.exists()) {
-	    	  System.out.println("Cannot find file: "+xmlfile);
-	    	  return null;
-	      }
-	      if(traceOn)System.out.println("Parse XML file: "+file);
-
-	      List<IFeedbackItem> items = new ArrayList<IFeedbackItem>();
-
-	      // look for file in same dir as xml file
-	      IPath p = new Path(xmlfile);
-	      p=p.removeLastSegments(1);
-	      String filepath=p.toPortableString()+IPath.SEPARATOR;//+"mhd.F";  
-
-	      document = builder.parse(file);
-		      
-	      XPathFactory factory = XPathFactory.newInstance();
-	      XPath xpath = factory.newXPath();
-	      
-	      /* get the hotspots */
-	      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();
-					fname=filepath+fname; // fully qualify (if needed?)
-					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
-
-
-	      
-	      return items;
-	}
-
-}

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 c014148..0000000
--- a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/SampleFeedbackView.java
+++ /dev/null

@@ -1,127 +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.FeedbackIDs;
-import org.eclipse.ptp.etfw.feedback.preferences.PreferenceConstants;
-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 b32824d..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 80d75ff..0000000
--- a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/actions/SampleFeedbackAction.java
+++ /dev/null

@@ -1,61 +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/pldt/org.eclipse.ptp.pldt.common/.classpath b/tools/pldt/org.eclipse.ptp.pldt.common/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/.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/tools/pldt/org.eclipse.ptp.pldt.common/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.common/.cvsignore
deleted file mode 100644
index c8a772f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/.cvsignore
+++ /dev/null

@@ -1,4 +0,0 @@
-bin
-@dot
-icons-old
-.optionsHIDE

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/.project b/tools/pldt/org.eclipse.ptp.pldt.common/.project
deleted file mode 100644
index 28efadf..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.common</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.common/.settings/org.eclipse.jdt.core.prefs b/tools/pldt/org.eclipse.ptp.pldt.common/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 3521ca8..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,8 +0,0 @@
-#Fri Apr 16 12:48:49 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.common/META-INF/MANIFEST.MF b/tools/pldt/org.eclipse.ptp.pldt.common/META-INF/MANIFEST.MF
deleted file mode 100644
index 9337a32..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/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.pldt.common; singleton:=true
-Bundle-Version: 4.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.pldt.common.CommonPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.cdt.core,
- org.eclipse.cdt.ui,
- org.eclipse.search,
- org.eclipse.ui.ide,
- org.eclipse.core.resources,
- org.eclipse.ui.editors,
- org.eclipse.help,
- org.eclipse.text,
- org.eclipse.ui.forms
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.ptp.pldt.common,
- org.eclipse.ptp.pldt.common.actions,
- org.eclipse.ptp.pldt.common.analysis,
- org.eclipse.ptp.pldt.common.editorHelp,
- org.eclipse.ptp.pldt.common.util,
- org.eclipse.ptp.pldt.common.views
-Bundle-ClassPath: .
-Bundle-Vendor: %pluginProvider
-Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/about.html b/tools/pldt/org.eclipse.ptp.pldt.common/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/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.common/about.ini b/tools/pldt/org.eclipse.ptp.pldt.common/about.ini
deleted file mode 100644
index b26762a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/about.ini
+++ /dev/null

@@ -1,27 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/about.mappings b/tools/pldt/org.eclipse.ptp.pldt.common/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/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/tools/pldt/org.eclipse.ptp.pldt.common/about.properties b/tools/pldt/org.eclipse.ptp.pldt.common/about.properties
deleted file mode 100644
index fcc9093..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/about.properties
+++ /dev/null

@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-blurb=PTP Parallel Language Development Tools\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-Copyright (c) 2008 IBM Corporation and others.  All rights reserved.\n\
-Visit http://www.eclipse.org/ptp\n
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/build.properties b/tools/pldt/org.eclipse.ptp.pldt.common/build.properties
deleted file mode 100644
index 61f1e5a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/build.properties
+++ /dev/null

@@ -1,13 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               icons/,\
-               plugin.properties,\
-               about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               eclipse32.png
-jars.compile.order = .

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/eclipse32.png b/tools/pldt/org.eclipse.ptp.pldt.common/eclipse32.png
deleted file mode 100644
index 568fac1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/eclipse32.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/icons/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.common/icons/.cvsignore
deleted file mode 100644
index 689daa3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/icons/.cvsignore
+++ /dev/null

@@ -1,4 +0,0 @@
-analyze_blue.gif
-artifact_a.gif
-artifact_sm.gif
-pspbrwse.jbf

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/icons/analyze.gif b/tools/pldt/org.eclipse.ptp.pldt.common/icons/analyze.gif
deleted file mode 100644
index 2b4542a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/icons/analyze.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/icons/filter_ps.gif b/tools/pldt/org.eclipse.ptp.pldt.common/icons/filter_ps.gif
deleted file mode 100644
index 6fe6f0e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/icons/filter_ps.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/plugin.properties b/tools/pldt/org.eclipse.ptp.pldt.common/plugin.properties
deleted file mode 100644
index e6e74db..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/plugin.properties
+++ /dev/null

@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2008,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 Parallel Language Development Tools Core
-pluginProvider=Eclipse.org
-
-page.name = Parallel Language Development Tools
-command.tooltip = Repeat last Parallel Analysis 
-category.name = Analysis Dropdown Category
-command.name = Analysis dropdown menu
-commandParameter.name = Message
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/plugin.xml b/tools/pldt/org.eclipse.ptp.pldt.common/plugin.xml
deleted file mode 100644
index 031f876..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/plugin.xml
+++ /dev/null

@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            class="org.eclipse.ptp.pldt.common.prefs.PLDTPreferencePage"
-            id="org.eclipse.ptp.pldt.common.prefs.PLDTPreferencePage"
-            name="%page.name"
-            category="org.eclipse.ptp.ui.preferences.ptpPreferencesPage"
-            />
-   </extension>
-   <extension
-         point="org.eclipse.core.runtime.preferences">
-      <initializer class="org.eclipse.ptp.pldt.common.prefs.PreferenceInitializer"/>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commands">
-      <category
-            id="org.eclipse.ptp.pldt.common.analysisDropdownCategory"
-            name="%category.name">
-      </category>
-      <command
-            id="org.eclipse.ptp.pldt.common.dropDownCommand"
-            categoryId="org.eclipse.ptp.pldt.common.analysisDropdownCategory"
-            defaultHandler="org.eclipse.ptp.pldt.common.actions.AnalysisDropdownHandler"
-            name="%command.name">
-         <commandParameter
-               id="org.eclipse.ptp.pldt.common.dropDownCommand.msg"
-               name="%commandParameter.name"
-               optional="true"
-               typeId="String">
-         </commandParameter>
-         <defaultHandler
-               class="org.eclipse.ptp.pldt.common.actions.AnalysisDropdownHandler">
-         </defaultHandler>
-      </command>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commandImages">
-      <image
-            commandId="org.eclipse.ptp.pldt.common.dropDownCommand"
-            icon="icons/analyze.gif">
-      </image>
-   </extension>
-   <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
-         <toolbar
-               id="org.eclipse.ptp.pldt.common.toolbar1">
-            <command
-                  commandId="org.eclipse.ptp.pldt.common.dropDownCommand"
-                  id="org.eclipse.ptp.pldt.common.toolbar.command1"
-                  style="pulldown"
-                  tooltip="%command.tooltip">
-            </command>
-         </toolbar>
-      </menuContribution>
-   </extension>
-   
-   <!-- these go under the dropdown menu; could come from another plugin -->
-   <extension point="org.eclipse.ui.menus">
-      <menuContribution
-            locationURI="menu:org.eclipse.ptp.pldt.common.toolbar.command1?after=additions">
-        
-          <separator name="separator1.mpi"/>
-          <separator name="separator2.openmp"/>
-          <separator name="separator3.otherArtifact"/>
-          <separator name="separator4.barrier"/>
-          <separator name="separator5.other" visible="false"/>
-          <separator
-                name="additions">
-          </separator>
-        
-      </menuContribution>
-   </extension>
-
-
-</plugin>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/Artifact.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/Artifact.java
deleted file mode 100644
index 050a547..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/Artifact.java
+++ /dev/null

@@ -1,244 +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.common;
-
-import java.util.Date;
-
-import org.eclipse.ptp.pldt.common.messages.Messages;
-import org.eclipse.ptp.pldt.common.util.SourceInfo;
-
-
-
-/**
- * Artifacts contain information about a framework (e.g. MPI) function call or constant reference found in source code.
- * 
- * Note: if we have any parent/child relationships, this class should know about it.
- * 
- * @author Beth Tibbitts
- * 
- */
-public class Artifact implements IArtifact
-{
-    /** Line number where the artifact occurs */
-    private int                  line_;
-    /** Column number where the artifact occurs (unused) */
-    private int                  column_;
-    /** in which file is the line */
-    private String               fileName_;
-    /** Longer description of MPI artifact */
-    private String               description_;
-    /** Short heading name of MPI artifact */
-    private String               shortName_;
-    
-    /** to help, this would likely be an AST node   */
-    private Object               artifactAssist_;
-    
-    /**
-     * Which file-analysis-invocation gave rise to this artifact.<br>
-     * (Analyzing one file may produce artifacts in another file. This is the first one)
-     */
-    private String               primaryfileName_;
-    /** New line number if changes are made to source (unused) */
-    private int                  newline_;
-    /** unique ID of artifact, using for lookups by ArtifactManager*/
-    private String               uniqueID_;
-    /** timestamp used for generating unique ids */
-    private static long          now_                 = new Date().getTime();
-    /** Object containing additional source information */
-    private SourceInfo           sourceInfo_;
-    /** Constant used in marker to indicate type of artifact is unspecified*/
-    
-    public static final int      NONE                 = 0;
-    /** Constant used in marker to indicate type of artifact is a function call*/
-    public static final int      FUNCTION_CALL        = 1;
-    /** Constant used in marker to indicate type of artifact is a constant*/
-    public static final int      CONSTANT             = 2;
-    /** Constant used in marker to indicate type of artifact is a pragma*/
-    public static final int      PRAGMA             = 3;
-
-    public static final String[] CONSTRUCT_TYPE_NAMES = { Messages.Artifact_none, Messages.Artifact_function_call, Messages.Artifact_constant,Messages.Artifact_pragma };
-
-    /**
-     * Create an Artifact to keep track of an something found in a file.
-     * 
-     * @param fileName
-     * @param line
-     * @param column
-     * @param shortName
-     * @param ignore
-     * @param primaryFileName
-     * @since 4.0
-     */
-    public Artifact(String fileName, int line, int column, String shortName, SourceInfo sourceInfo)
-    {
-        this.line_ = line;
-        this.newline_ = line;
-        this.column_ = column;
-        this.fileName_ = fileName;
-        this.shortName_ = shortName;
-        this.sourceInfo_ = sourceInfo;
-        setId();
-    }
-    
-    /**
-     * Create an MPI Artifact to keep track of an MPI function call (or ???) in a file.
-     * 
-     * @param fileName
-     * @param line
-     * @param column
-     * @param shortName
-     * @param desc
-     * @param sourceInfo
-     * @param artifactAssist
-     */
-    public Artifact(String fileName, int line, int column, String shortName, String desc, SourceInfo sourceInfo,
-                    Object artifactAssist)
-    {
-        this.line_ = line;
-        this.newline_ = line;
-        this.column_ = column;
-        this.fileName_ = fileName;
-        this.shortName_ = shortName;
-        this.sourceInfo_ = sourceInfo;
-        this.artifactAssist_ = artifactAssist;
-        setId();
-    }
-    
-
-    public Artifact(String fileName, int line, int column, String shortName, String desc, boolean ignore,
-            String primaryFileName, SourceInfo sourceInfo)
-    {
-        this(fileName, line, column, shortName, sourceInfo);
-        this.primaryfileName_ = primaryFileName;
-    }
-
-    // How to create an Eclipse IFile object from its fully-qualified name
-    // import org.eclipse.core.resources.IFile;
-    // import org.eclipse.core.runtime.Path;
-    // import com.ibm.ngp.core.NGPPlugin;
-    // import com.ibm.ngp.core.common.Log;
-    /*
-     * IFile f = NGPPlugin.getWorkspace().getRoot().getFileForLocation(new Path(filename)); if (f != null && f.exists()) { //
-     * after checking that a file with this name actually exists, // here's how to get the fully-qualified name back
-     * from the IFile object: Log.printit("PI ctor file is: "+f.getRawLocation()); }
-     */
-
-    /**
-     * Set unique ID for this MPI artifact. Base 36 values use 0..9a...z and are at most 8 characters long. Will not be
-     * repeated (u
-     * 
-     * @return string of unique ID.
-     */
-    protected void setId()
-    {
-        uniqueID_ = Long.toString(now_++, 36);
-    }
-
-    public String getId()
-    {
-        return uniqueID_;
-    }
-
-    /**
-     * Hand representation of data, useful for debugging, etc.
-     */
-    public String toString()
-    {
-        StringBuffer buf = new StringBuffer(Messages.Artifact_artifact);
-        buf.append(" id=").append(uniqueID_); //$NON-NLS-1$
-        buf.append(" ").append(shortName_); //$NON-NLS-1$
-        buf.append(" line=").append(line_).append(" filename=").append(fileName_); //$NON-NLS-1$ //$NON-NLS-2$
-        buf.append(" desc=").append(description_); //$NON-NLS-1$
-        buf.append(" start=").append(getSourceInfo().getStart()); //$NON-NLS-1$
-        buf.append(" end=").append(getSourceInfo().getEnd()); //$NON-NLS-1$
-        return buf.toString();
-    }
-
-    public int getColumn()
-    {
-        return column_;
-    }
-
-    public void setColumn(int column_)
-    {
-        this.column_ = column_;
-    }
-
-    public String getDescription()
-    {
-        return description_;
-    }
-
-    public void setDescription(String description_)
-    {
-        this.description_ = description_;
-    }
-
-    public String getFileName()
-    {
-        return fileName_;
-    }
-
-    public void setFileName(String fileName_)
-    {
-        this.fileName_ = fileName_;
-    }
-
-    public int getLine()
-    {
-        return line_;
-    }
-
-    public void setLine(int line_)
-    {
-        this.line_ = line_;
-    }
-
-    public String getPrimaryfileName()
-    {
-        return primaryfileName_;
-    }
-
-    public void setPrimaryfileName(String primaryfileName_)
-    {
-        this.primaryfileName_ = primaryfileName_;
-    }
-
-    public String getShortName()
-    {
-        return shortName_;
-    }
-
-    public void setShortName(String shortName_)
-    {
-        this.shortName_ = shortName_;
-    }
-
-    /**
-     * @return Returns the sourceInfo_.
-     */
-    public SourceInfo getSourceInfo()
-    {
-        return sourceInfo_;
-    }
-
-    public int getNewline()
-    {
-        return newline_;
-    }
-    
-    public Object getArtifactAssist()
-    {
-        return artifactAssist_;
-    }
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/ArtifactManager.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/ArtifactManager.java
deleted file mode 100644
index 3b5165a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/ArtifactManager.java
+++ /dev/null

@@ -1,155 +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.common;
-
-import java.util.HashMap;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-
-
-/**
- * Manage the artifacts: be able to retrieve an artifact from the id in a marker, for example.
- * <p>
- * Note that there can be more than one ArtifactManager, distinguished by 
- * an ID, probably a markerID.  That is, all artifacts of the same markerID
- * (probably shown in the same view) are managed by the same (distinct) ArtifactManager.
- * 
- * TODO Question: why can't we just store the objects in an attribute?? 
- * @author Beth Tibbitts
- * 
- * 
- */
-public class ArtifactManager {
-
-
-	/** to be able to look up artifacts by unique ID */
-	static HashMap hashMap = new HashMap();  
-
-	/** ID for this registry */
-	private String id_;
-
-	/**
-	 * Registry of artifact managers. IDs are probably markerIDs for the type of
-	 * artifacts that this ArtifactManager holds.
-	 */
-	public static HashMap registry = new HashMap();
-
-	public ArtifactManager(String id) {
-		this.id_ = id;
-		registry.put(id, this);
-
-	}
-
-	/** disallow default ctor */
-	@SuppressWarnings("unused")
-	private ArtifactManager() {
-	}
-
-	/**
-	 * return the ArtifactManager used for managing artifacts of type "id"
-	 * (probably a marker id)
-	 * 
-	 * @param id
-	 * @return
-	 */
-	public static ArtifactManager getManager(String id) {
-        Object o = (Object)registry.get(id);
-        if (o==null)
-            new ArtifactManager(id);
-		return (ArtifactManager) registry.get(id);
-	}
-	/**
-	 * return the artifact for a marker; involves looking up the
-	 * Artifact Manager, then the Artifact within that.
-	 * 
-	 * Maybe we just need a big hashtable or other big Map instead???
-	 * 
-	 * @param marker
-	 * @return
-	 * @throws CoreException
-	 */
-	public static IArtifact getArtifact(IMarker marker) throws CoreException{
-		String id = (String) marker.getAttribute(IDs.UNIQUE_ID);
-		String markerID=marker.getAttribute(IDs.ID).toString();
-		ArtifactManager aMgr=getManager(markerID);
-		IArtifact a =  aMgr.getArtifact(id);
-		
-		return a;
-	}
-
-
-
-	/**
-	 * Add an artifact to the hashtable for future lookup
-	 * 
-	 * @param artifact
-	 */
-	public void addArtifactToHash(IArtifact a) {
-		String id = a.getId(); // for debugging access only
-		hashMap.put(id, a);
-	}
-
-	/**
-	 * retrieve artifact by unique ID. Used for retrieving artifacts when needed
-	 * from the Markers - since markers can't hold on to them
-	 * 
-	 * @param id
-	 * @return
-	 */
-	public IArtifact getArtifact(String id) {
-		IArtifact artifact = (Artifact) hashMap.get(id);
-		return artifact;
-	}
-
-	public Object[] getArtifacts() {
-		Object[] artifacts = hashMap.values().toArray();
-		return artifacts;
-	}
-
-	public HashMap getArtifactMap() {
-		return hashMap;
-	}
-	/**
-	 * Remove artifact by artifact object
-	 * @param a
-	 * @return true if it was removed
-	 */
-	public boolean removeArtifact(IArtifact a){
-		return removeArtifact(a.getId());
-	}
-	/**
-	 * Remove artifact by key
-	 * @param key
-	 * @return
-	 */
-	public boolean removeArtifact(String key){
-		if(hashMap.containsKey(key)){
-			hashMap.remove(key);
-			return true;
-		}
-		return false;
-	}
-	/**
-	 * Remove all the artifacts
-	 *
-	 */
-	public void clear(){
-		hashMap.clear();
-	}
-	public String toString(){
-		return "ArtifactManager for "+id_; //$NON-NLS-1$
-	}
-
-
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/ArtifactMarkingVisitor.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/ArtifactMarkingVisitor.java
deleted file mode 100644
index eb5cb7b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/ArtifactMarkingVisitor.java
+++ /dev/null

@@ -1,338 +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.common;
-
-/**
- * Artifact Visitor - Generic - for delta or full build
- * @author Beth Tibbitts
- * 
- */
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ui.texteditor.MarkerUtilities;
-
-
-/**
- * Processes an <code>IResource</code> or an <code>IResourceDelta</code> to set Artifact Markers on the files
- * and populate the data model used for the Artifact view(s).
- */
-public class ArtifactMarkingVisitor implements IResourceDeltaVisitor, IResourceVisitor
-{
-
-    private static final boolean traceOn = false;
-    protected String markerID_;
-    protected ArtifactManager artifactManager_;
-    private boolean removeMarkers;
-    
-    /**
-     * Construction that allows specification of whether or not to removed old
-     * markers on this resource before creating new ones
-     * @param markerId
-     * @param removeMarkers
-     */
-    public ArtifactMarkingVisitor(String markerId, boolean removeMarkers)
-    {
-        this.markerID_ = markerId;
-        this.removeMarkers=removeMarkers;
-        this.artifactManager_=ArtifactManager.getManager(markerID_);
-        if(artifactManager_==null){
-        	System.out.println("no manager yet!"); //$NON-NLS-1$
-        }
-    }    
-    
-    /**
-     * Constructor that uses the default behavior that WILL remove old markers
-     * on the resource before creating new ones.  (This is the former behavior,
-     * now the default behavior)
-     * @param markerID 
-     */
-    public ArtifactMarkingVisitor(String markerID)
-    {
-      this(markerID, true);
-    }
-
-    /**
-     * Generic visiting of a file, to presumably add markers. This version is called from a build.
-     * 
-     * @param resource
-     * @return
-     * @author Beth Tibbitts
-     */
-    public boolean visitFile(IResource resource)
-    {
-        // System.out.println("filename="+resource.getLocation().toString());
-        Artifact[] artifacts = getPIs(resource);
-        return visitFile(resource, artifacts);
-
-    }
-
-    /**
-     * Generic version to put markers on a file, given the file(resource) and the list of artifacts
-     * 
-     * @param resource
-     * @param artifacts list of artifact objects
-     * @return
-     */
-    public boolean visitFile(IResource resource, Artifact[] artifacts)
-    {
-        try {
-            if (traceOn) System.out.println("ArtifactMarkingVisitor.visitFile: " + resource.getName()); //$NON-NLS-1$
-            // first clear existing markers (not: not doing anything ArtifactManager now.)
-            if(removeMarkers) {
-            	removeMarkers(resource, this.markerID_);
-            }
-            int numArtifacts=artifactManager_.getArtifacts().length;
-            if(traceOn)System.out.println("numArtifacts: "+numArtifacts); //$NON-NLS-1$
-            
-            String fn = resource.getProjectRelativePath().toString();
-
-            if (artifacts != null) {
-                createMarkers(resource, fn, artifacts);
-            }
-        } catch (CoreException e) {
-            e.printStackTrace();
-        }
-        return true;
-
-    }
-
-    public boolean visitFile(IResource resource, List<Artifact> artifacts)
-    {
-        Artifact[] artifactArray = new Artifact[artifacts.size()];
-        int i = 0;
-        for (Iterator<Artifact> iter = artifacts.iterator(); iter.hasNext();) {
-            Artifact element = (Artifact) iter.next();
-            artifactArray[i] = element;
-            i++;
-        }
-        return visitFile(resource, artifactArray);
-    }
-
-    /**
-     * Create markers for a file. This method creates a marker for each artifact. It also populates/refreshes the
-     * views.
-     * 
-     * @param resource assumed to be a file, resource upon which to place the marker(s)
-     * @param fn - filename
-     * @param artifacts - array of Artifact objects for which to create markers.
-     * @throws CoreException
-     */
-    protected void createMarkers(IResource resource, String fn, Artifact[] artifacts) throws CoreException
-    {
-        if (traceOn) System.out.println("ArtifactMarkingVisitor.createMarkers: " + resource.getName() + " #artifacts=" + artifacts.length); //$NON-NLS-1$ //$NON-NLS-2$
-
-        for (int i = 0; i < artifacts.length; i++) {
-            Artifact artifact = artifacts[i];
-            // artifactMarker 'inherits' from textMarker(see plugin.xml)
-            // If it also inherited from ProblemMarker, it would automagically show in more views (e.g. Problems view)
-            if (artifact != null) {
-                // 1. make marker for main Artifact
-
-                // Get correct filename for include files
-                // Actual file containing artifact may be an include file, so use it
-                // instead of the original file being analyzed
-                String filename = artifact.getFileName();
-                IResource f = resource;
-                // If artifact is not on same file being analyzed, correct it
-                // and get the actual file. E.G. an include file
-                // (don't create another resource object if we don't need to)
-                // System.out.println("resLocn="+resource.getRawLocation().toString());
-                // if (!resLocn.equals(filename))
-                // f = MpiPlugin.getWorkspace().getRoot().getFileForLocation(
-                // new Path(pifn));
-                //
-                int index=filename.lastIndexOf('/');
-                if(index==-1){
-                	index=filename.lastIndexOf('\\');
-                }
-                if(index!=-1){
-                	// BRT note: if contains both / and \ this won't work
-                	// trucate to last portion of path
-                	// this shd probably be a user preference, if this is truncated or not
-                	String tmp2=filename.substring(index+1);
-                	filename=tmp2;
-                	
-                }
-                createArtifactMarker(f, artifact, filename);
-
-                // If making other views, e.g. tree view, add to model tree for view here..
-            } else {
-                if (traceOn)
-                    System.out.println("*** artifact for " + fn + "is null! ********"); //$NON-NLS-1$ //$NON-NLS-2$
-                else {
-                }
-            }
-            // now refresh the tree view!!
-            // MPITree.getTree().refresh();
-        }
-    }
-
-    /**
-     * create the marker for the artifact, and add it to
-     * the repository (ArtifactManager)
-     * @param resource
-     * @param artifact
-     * @param fn
-     * @throws CoreException
-     */
-    protected void createArtifactMarker(IResource resource, Artifact artifact, String fn) throws CoreException
-    {
-        if (traceOn) System.out.println("Artifact desc=" + artifact.getShortName() + "  fn=" + fn); //$NON-NLS-1$ //$NON-NLS-2$
-        Map<String, Object> attrs = createCommonMarkerAttrs(resource, artifact, fn);
-        // message attribute will be used for hover over editor location
-        attrs.put(IMarker.MESSAGE, artifact.getShortName());
-        // create the marker all at once, so get ONLY a single resourceChange event.
-        MarkerUtilities.createMarker(resource, attrs, this.markerID_);  // 154
-        if (traceOn)
-            System.out.println("marker created: for " + fn + " - " + artifact.getShortName() + " line " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                    + artifact.getLine() + " start " + artifact.getSourceInfo().getStart() + " end " //$NON-NLS-1$ //$NON-NLS-2$
-                    + artifact.getSourceInfo().getEnd());
-        
-        artifactManager_.addArtifactToHash(artifact);
-    }
-
-    /**
-     * Create marker attributes with common information shared by everyone
-     * 
-     * @param resource File on which analysis was run
-     * @param artifact the artifact object
-     * @param fn project relative path of the resource
-     * @return
-     * 
-     * Note we are not creating the marker here; we do it all at once after attributes are calculated, so that a single
-     * resourceChange event gets triggered
-     */
-    protected Map<String, Object> createCommonMarkerAttrs(IResource resource, Artifact artifact, String fn)
-    {
-        Map<String, Object> attrs = new HashMap<String, Object>();
-        attrs.put(IMarker.PRIORITY, new Integer(IMarker.PRIORITY_NORMAL));
-        attrs.put(IMarker.LINE_NUMBER, new Integer(artifact.getLine()));
-        // use filename from the artifact, not the base file being analysed,
-        // because the artifact may be a result of reporting on e.g. an include file
-        attrs.put(IMarker.LOCATION, artifact.getFileName());
-        attrs.put(IDs.FILENAME, fn); // fn being processed
-        attrs.put(IDs.NAME, artifact.getShortName());
-        attrs.put(IDs.DESCRIPTION, artifact.getDescription());
-
-        // java5
-        // // trying setting the marker to more precise location
-        // attrs.put(IMarker.CHAR_START, artifact.getSourceInfo_().getStart());
-        // attrs.put(IMarker.CHAR_END, artifact.getSourceInfo_().getEnd());
-        //
-        // // adding construct type, i.e. func call, constants, ect.
-        // attrs.put(IDs.CONSTRUCT_TYPE, artifact.getSourceInfo_().getConstructType());
-
-        // trying setting the marker to more precise location
-        attrs.put(IMarker.CHAR_START, new Integer(artifact.getSourceInfo().getStart()));
-        attrs.put(IMarker.CHAR_END, new Integer(artifact.getSourceInfo().getEnd()));
-
-        // adding construct type, i.e. func call, constants, ect.
-        attrs.put(IDs.CONSTRUCT_TYPE, new Integer(artifact.getSourceInfo().getConstructType()));
-
-        String id = ((Artifact) artifact).getId();
-        attrs.put(IDs.ID, id); // used to look up to get artifact from marker later
-        attrs.put(IDs.LINE, Integer.toString(artifact.getLine()));
-        if (traceOn)
-            System.out.println("marker created: for " + fn + " - " + artifact.getDescription() + " line " + artifact.getLine()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        return attrs;
-    }
-
-    /**
-     * Get Artifacts for a given resource. e.g. could reads XML file that is presumed to be in same folder as
-     * resource file.
-     * 
-     * @param r The resource (file assumed) for which to look for artifacts
-     * @return a list of artifacts
-     */
-    public static Artifact[] getPIs(IResource r)
-    {
-        System.out.println("*UNIMPLEMENTED** ArtifactMarkingVisitor.getPIs: " + r.getName()); //$NON-NLS-1$
-        return null;
-    }
-
-    /**
-     * Remove the markers currently set on a resource.
-     * 
-     * @param resource
-     */
-    private void removeMarkers(IResource resource, String markerID)
-    {
-        if (traceOn) System.out.println("ArtifactMarkingVisitor.removeMarkers: " + resource.getName()); //$NON-NLS-1$
-
-        try {
-            resource.deleteMarkers(markerID, false, IResource.DEPTH_INFINITE);
-            // also sync up tree view
-            // MPITree.getTree().removeIssues(resource);
-        } catch (CoreException e) {
-            System.out.println(e);
-            System.out.println(e.toString());
-            System.out.println("Problem deleting markers on " + resource.getProjectRelativePath()); //$NON-NLS-1$
-        }
-    }
-
-    /**
-     * Implemented for IResourceDeltaVisitor Required implementation of the visit method. The
-     * <code>IResourceDelta</code> is processed by providing it a visitor using the <code>accept()</code> method and
-     * using this method in the visitor to process any events of interest.
-     * 
-     * Processing continues as long as this method returns true or when the end of the <code>IResourceDelta</code> has
-     * been reached.
-     */
-    public boolean visit(IResourceDelta delta) throws CoreException
-    {
-        // if (traceOn)System.out.println("ArtifactMarkingVisitor.visit(resourceDelta)...");
-        IResource resource = delta.getResource();
-        int type = resource.getType();
-        if ((delta.getKind() != IResourceDelta.REMOVED) && (type == IResource.FILE)) {
-            // System.out.println("delta visitor visits FILE: " +
-            // resource.getProjectRelativePath());
-            visitFile(resource);
-        }
-        return true; // carry on
-    }
-
-    /**
-     * Implemented for IResourceVisitor
-     */
-    public boolean visit(IResource resource)
-    {
-        if (resource.getType() == IResource.FILE) {
-            // if (traceOn)System.out.println("FULL visitor visits FILE: " +
-            // resource.getProjectRelativePath());
-            visitFile(resource);
-        }
-        return true; // carry on
-    }
-
-    /**
-     * Show an artifact object - print for debugging/tracing purposes
-     * 
-     * @param artifact the Artifact Object
-     */
-    public static void showArtifact(Artifact artifact)
-    {
-        System.out.println("Artifact name: " + artifact.getShortName()); //$NON-NLS-1$
-        System.out.println("   Description: " + artifact.getDescription()); //$NON-NLS-1$
-        System.out.println("   Filename:    " + artifact.getFileName()); //$NON-NLS-1$
-
-    }
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/CommonPlugin.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/CommonPlugin.java
deleted file mode 100644
index 1596bd0..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/CommonPlugin.java
+++ /dev/null

@@ -1,200 +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.common;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class for PLDT (PTP's Parallel Language Development Tools)
- * 
- * @author Beth Tibbitts
- */
-public class CommonPlugin extends AbstractUIPlugin {
-
-	/** The shared instance. */
-	private static CommonPlugin plugin;
-	/** Resource bundle */
-	private ResourceBundle resourceBundle;
-
-	private static boolean eclipseTraceOn = false;
-	private static boolean haveReadTraceStatus = false;
-	public static final String PLUGIN_ID = "org.eclipse.ptp.pldt.common"; //$NON-NLS-1$
-
-	/**
-	 * To use dynamic tracing (User instructions): Create a file ".options" in
-	 * the same directory as your eclipse executable. Put this in the file:
-	 * 
-	 * <pre>
-	 *  org.eclipse.ptp.pldt.common/debug = true
-	 *  org.eclipse.ptp.pldt.common/debug/pldtTrace = true
-	 * </pre>
-	 * 
-	 * Then launch eclipse in debug mode using the -debug option, and mirror the
-	 * Console view output to the command line console using the -consoleLog
-	 * option. (Maybe Linux already spits out the console, not sure.)
-	 * 
-	 * <pre>
-	 * eclipse - debug - consoleLog
-	 * </pre>
-	 * 
-	 * When you run with this tracing enabled, it will print out a bunch of
-	 * trace information to the console. At least MPI artifact analysis has been
-	 * enabled for user-directed tracing.
-	 * 
-	 * @return
-	 */
-	public static boolean getTraceOn() {
-		if (!haveReadTraceStatus) {
-			String traceFilter = Platform.getDebugOption("org.eclipse.ptp.pldt.common/debug/pldtTrace"); //$NON-NLS-1$
-			if (traceFilter != null) {
-				System.out.println("CommonPlugin.getTraceOn(): pldtTrace trace filtering is on; traceFilter= " + traceFilter); //$NON-NLS-1$
-				eclipseTraceOn = true;
-			}
-			haveReadTraceStatus = true;
-		}
-		return eclipseTraceOn;
-	}
-
-	/**
-	 * The constructor.
-	 */
-	public CommonPlugin() {
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		// there's probably a better place to put this, but...
-		getPreferenceStore().setDefault(IDs.SHOW_ANALYSIS_CONFIRMATION, true);
-		/*
-		 * // project re-reqs should keep this from being necessary, so omit the
-		 * print and check. Bundle
-		 * cdtBundle=Platform.getBundle("org.eclipse.cdt.core"); String version
-		 * = (String)
-		 * cdtBundle.getHeaders().get(org.osgi.framework.Constants.BUNDLE_VERSION
-		 * ); //System.out.println("CDT version: "+version); boolean versOK =
-		 * version.startsWith("4.0.2")|| version.startsWith("4.0.3") ||
-		 * version.startsWith("5"); if(!versOK){ System.out.println(
-		 * "**Warning, wrong version of CDT.  Version 4.0.2 or higher is required with PLDT 2.0"
-		 * ); String
-		 * msg="This is PLDT 2.0 which requires CDT Version 4.0.2 or higher.";
-		 * msg+="\nThis eclipse installation contains CDT version "+version;
-		 * MessageDialog.openError(null, "Version mismatch", msg); }
-		 */
-	}
-
-	/**
-	 * 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 CommonPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given plug-in
-	 * relative path.
-	 * 
-	 * @param path
-	 *            the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-
-	/**
-	 * 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;
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		try {
-			if (resourceBundle == null)
-				resourceBundle = ResourceBundle.getBundle("org.ptp.pldt.common.CommonPluginResources"); //$NON-NLS-1$
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-		return resourceBundle;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle, or 'key' if not
-	 * found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = CommonPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Write to the ".log" file
-	 * 
-	 * @param type
-	 *            type of log entry, e.g. IStatus.ERROR, IStatus.WARNING, etc.
-	 * @param msg
-	 *            the message to be displayed
-	 */
-	public static void log(int type, String msg) {
-		String pluginID = getDefault().getBundle().getSymbolicName();
-		Exception exc = null;// ignore exception for now
-		IStatus status = new Status(type, pluginID, type, msg, exc);
-		getDefault().getLog().log(status);
-
-	}
-
-	/**
-	 * Write to the ".log" file with default status type of IStatus.INFO
-	 * 
-	 * @param msg
-	 *            the message to be displayed.
-	 */
-	public static void log(String msg) {
-		log(IStatus.INFO, msg);
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/IArtifact.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/IArtifact.java
deleted file mode 100644
index f3592a0..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/IArtifact.java
+++ /dev/null

@@ -1,42 +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.common;
-
-import org.eclipse.ptp.pldt.common.util.SourceInfo;
-
-/**
- * Artifacts contain information about something found in source code.
- * 
- * @author tibbitts
- *
- */
-public interface IArtifact
-{
-    public int getColumn();
-    public void setColumn(int col);
-    public String getDescription();
-    public String getFileName();
-    public String getId();
-    public int getLine();
-    public void setLine(int lineNo);
-    public String getPrimaryfileName();
-    public String getShortName();
-    public void setShortName(String name);
-    public SourceInfo getSourceInfo();
-    
-    
-    
-    
-    
-    
-    
-    
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/IDs.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/IDs.java
deleted file mode 100644
index e75a7e1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/IDs.java
+++ /dev/null

@@ -1,50 +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.common;
-
-/**
- * Misc. IDs for preferences, markers, etc.
- * 
- * @author tibbitts
- * 
- */
-public interface IDs
-{
-    String P_RUN_ANALYSIS  = "runAnalysis"; //$NON-NLS-1$
-    String P_ECHO_FORCE    = "forceEcho"; //$NON-NLS-1$
-//    String MARKER_ERROR_ID = "org.eclipse.ptp.pldt.mpi.core.mpiErrorMarker";
-//    String MARKER_ID       = "org.eclipse.ptp.pldt.mpi.core.mpiMarker";
-    String FILENAME        = "filename"; //$NON-NLS-1$
-    String NAME            = "name"; //$NON-NLS-1$
-    String DESCRIPTION     = "description"; //$NON-NLS-1$
-    String ID              = "uniqueID"; //$NON-NLS-1$
-
-    // note built-in marker id too... not sure this is used,
-    // compare with IMarker.LINE_NUMBER which is probably used instead.
-    String LINE            = "theLineNo"; //$NON-NLS-1$
-    String NEWLINE         = "theNewLineNo"; //$NON-NLS-1$
-
-    // preference page name for MPI Includes field label
-//    static public final String MPI_INCLUDES    = "MPI Includes";
-
-    // marker attribute for the extra info saved for each marker/artifact
-    String CONSTRUCT_TYPE  = "constructType"; //$NON-NLS-1$
-    /**
-	 * Key for storing preference of whether or not to show popup confirmation
-	 * dialog when analysis is complete.
-	 */
-	String SHOW_ANALYSIS_CONFIRMATION = "showAnalysisConfirmation"; //$NON-NLS-1$
-	String UNIQUE_ID = "uniqueID"; //$NON-NLS-1$
-    
-    // id for MPI Artifact view
-//    String MPI_VIEW_ID = "org.eclipse.ptp.pldt.mpi.core.views.MPITableView";
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/ScanReturn.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/ScanReturn.java
deleted file mode 100644
index 45bc087..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/ScanReturn.java
+++ /dev/null

@@ -1,53 +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.common;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * This object represents the collection of  artifacts (e.g. MPI or OpenMP artifacts) returned from analysis, 
- * which will eventually be displayed in
- * the associated view, etc. <br>
- * It can also contain other information such as return codes, generalized analysis results, parameters, etc. <br>
- * 
- * @author Beth Tibbitts
- * 
- */
-public class ScanReturn
-{
-
-    private List<Artifact> artifacts = new ArrayList<Artifact>();
-    
-    public ScanReturn()
-    {      
-    }
-
-    public boolean wasError()
-    {
-        return false;
-    }
-
-    public List<Artifact> getArtifactList()
-    {
-        return artifacts;
-    }
-
-    public void addArtifact(Artifact a)
-    {
-        artifacts.add(a);
-    }
-    public String toString() {
-    	return "ScanReturn with "+artifacts.size()+" artifacts";
-    }
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/actions/AnalysisDropdownHandler.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/actions/AnalysisDropdownHandler.java
deleted file mode 100644
index 96eb915..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/actions/AnalysisDropdownHandler.java
+++ /dev/null

@@ -1,174 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,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.common.actions;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ptp.pldt.common.CommonPlugin;
-import org.eclipse.ptp.pldt.common.messages.Messages;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.ISelectionService;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-
-/**
- * Default handler for the "Parallel Analysis" toolbar icon command -
- * the work would be done by the menus that get registered (by other plugins)
- * to appear beneath it, but  this itself can do something useful
- * by repeating the last-initiated submenu action.  ("Do the last thing again")
- * 
- * This class also acts as a single point to cache the current structured selection
- * so that when a menu item is selected, the current selection can be accessed.
- * It registers as a selection listener to actively listen for selection changes,
- * instead of relying on HandlerUtil which won't get the first one (e.g. before
- * the plugin is loaded).
- * 
- * @author Beth Tibbitts
- *
- */
-public class AnalysisDropdownHandler extends AbstractHandler implements ISelectionListener {
-	static protected RunAnalyseHandler lastAnalysisHandler=null;
-	static protected IStructuredSelection lastAnalysisSelection=null;
-	protected IStructuredSelection lastSelection=null;
-	protected static AnalysisDropdownHandler instance=null;
-	private static final boolean traceOn=false;
-
-	/**
-	 * Constructor: set singleton instance, and set up selection listener to 
-	 * listen for selections so we can report them more efficiently
-	 * than relying on HandlerUtil.getCurrentSelection();
-	 * if the current selection isn't a structured selection (e.g. editor selection or something
-	 * we don't care about) then we want the last structured selection.
-	 * If we can't find a structured selection at the time this ctor is called,
-	 * go get the selection in the Project Explorer; it's probably what we want
-	 * (for the case when an editor has just been opened by double-clicking on its
-	 * entry in the project explorer: it's still selected in the Proj explorer,
-	 * but the editor now has the focus).
-	 */
-	public AnalysisDropdownHandler(){
-		if(traceOn)System.out.println("AnalysisDropdownHandler() ctor... should not be >1 of these"); //$NON-NLS-1$
-		assert(instance==null);  // we presume this is a singleton
-		instance=this;
-		ISelectionService ss=null;
-		try {
-			// register to be notified of future selections
-			ss = CommonPlugin.getDefault().getWorkbench()
-					.getActiveWorkbenchWindow().getSelectionService();
-			ss.addSelectionListener(this);
-			// and cache the selection that was in effect now.
-			ISelection sel= ss.getSelection();//gives selection in ACTIVE PART.If editor was just opened, active part is probably the editor.
-			//
-			if(sel instanceof IStructuredSelection) {
-				lastSelection=(IStructuredSelection)sel;
-				if(traceOn)
-					System.out.println("  ...got initial selection."); //$NON-NLS-1$
-			}
-		} catch (Exception e) {
-			Throwable t=e.getCause();
-			//e.printStackTrace();
-			String msg ="(no cause)"; //$NON-NLS-1$
-			if(t!=null)
-				msg=t.getMessage();
-			System.out.println("AnalysisDropdownHandler <init> "+ e.getMessage()+" cause: "+msg); //$NON-NLS-1$ //$NON-NLS-2$
-			// FIXME this gets hit on target workbench shutdown. WHY?
-			// BRT maybe we DO want to return here; sometimes ss=null (Junit tests) and the code below fails sometimes.
-			return;
-
-		}
-
-
-		// If we still don't know the selection then find out the selection in the
-		// project explorer view - its guess is probably right.
-		if (lastSelection == null) {
-			String projExpID = "org.eclipse.ui.navigator.ProjectExplorer"; //$NON-NLS-1$
-			ISelection apSel = ss.getSelection(projExpID);
-			if (apSel != null & apSel instanceof IStructuredSelection) {
-				if (!apSel.isEmpty()) {
-					lastSelection = (IStructuredSelection) apSel;
-				}
-			}
-		}
-	}
-
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		if(traceOn)System.out.println("AnalysisDropdownHandler.execute()..."); //$NON-NLS-1$
-		ISelection selection = HandlerUtil.getCurrentSelection(event);
-		if(traceOn)System.out.println("selection: "+selection); //$NON-NLS-1$
-		
-		if(lastAnalysisHandler!=null){
-			if(traceOn)System.out.println("Last analysis was: "+lastAnalysisHandler); //$NON-NLS-1$
-			lastAnalysisHandler.execute(event);
-		}
-		else {
-			final String msg = Messages.AnalysisDropdownHandler_9;
-			MessageDialog.openInformation(null, Messages.AnalysisDropdownHandler_10, msg);
-		}
-
-	    return null;
-	}
-	/**
-	 * Remember what was last executed, so that we can give a repeat performance
-	 * @param handler
-	 * @param selection - cache the selection too; this will be used as a last 
-	 * resort if another analysis doesn't see a recent selection it likes.
-	 */
-	public static void setLastHandledAnalysis(RunAnalyseHandler handler, IStructuredSelection selection){
-		lastAnalysisHandler = handler;
-		if(selection!=null){
-			lastAnalysisSelection=selection;
-		}
-		
-		if(traceOn)System.out.println("lastAnalysisHandler set to: "+lastAnalysisHandler); //$NON-NLS-1$
-		
-	}
-	public static IStructuredSelection getLastAnalysisSelection(){
-		return lastAnalysisSelection;
-	}
-
-	/**
-	 * Implemented for SelectionListener interface:
-	 * Listen for selection changes and cache the ones that might be
-	 * interesting to us.
-	 */
-	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-		if(selection instanceof IStructuredSelection) {
-			lastSelection=(IStructuredSelection)selection;
-			if(traceOn)System.out.println("ADDH.selectionChanged, got structured selection"); //$NON-NLS-1$
-		}
-		
-	}
-	/**
-	 * The last structured selection seen
-	 * @return
-	 */
-	public IStructuredSelection getLastSelection() {
-		return lastSelection;
-	}
-	/**
-	 * Get the singleton instance of this class, probably for accessing its
-	 * knowledge about the current/last selection of interest.
-	 * 
-	 * @return
-	 */
-	public static AnalysisDropdownHandler getInstance() {
-		if(instance==null) {
-			instance=new AnalysisDropdownHandler();
-		}
-		return instance;
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/actions/RunAnalyseHandler.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/actions/RunAnalyseHandler.java
deleted file mode 100644
index b269966..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/actions/RunAnalyseHandler.java
+++ /dev/null

@@ -1,187 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,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.common.actions;
-
-import java.util.Iterator;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-/**
- * 
- * RunAnalyseHandler - keeps state information for the analysis handlers in
- * the dropdown analysis menu.
- * Common behavior is in  (derived class) RunAnalyseHandlerBase.
- * 
- * That is, the AnalysisDropdownHandler will repeat the action of the last RunAnalyseHandler 
- * that was executed - they are cached as one of these.
- * 
- * @author Beth Tibbitts
-
- */
-public abstract class RunAnalyseHandler extends AbstractHandler {
-	/**
-	 * the current selection is cached here
-	 */
-	protected IStructuredSelection selection;
-
-	public RunAnalyseHandler(){
-	}
-
-	/**
-	 * Get the current selection from the handler event. If it's a structured selection
-	 * (e.g. resource in the project explorer) then return it.
-	 * If it's e.g. a text selection in the editor, we don't care about that
-	 * 
-	 * Note that we  cache the last structured selection (like the previous "action" version
-	 * of this class) since we don't get selection changed events.
-	 * However, AnalysisDropDownHandler does get these events, and its value
-	 * will be used if HanderUtil doesn't have any information yet.
-	 * 
-	 * @param event
-	 * @return the current selection if it's a structured selection e.g. in the navigator
-	 */
-	public IStructuredSelection getSelection(ExecutionEvent event) {
-		ISelection curSel = HandlerUtil.getCurrentSelection(event);
-		if (curSel instanceof IStructuredSelection) {
-			selection = (IStructuredSelection) curSel;
-		}
-		
-		if(selection == null) {
-			selection = AnalysisDropdownHandler.getInstance().getLastSelection();
-		}
-		// If there isn't a current selection appropriate for us,
-		// get the last one used in any analysis.
-		// Since we now register as a selection listener,
-		// I doubt this is ever utilized.
-		if (selection == null) {
-			selection = AnalysisDropdownHandler.getLastAnalysisSelection();
-		}
-		return selection;
-	
-	}
-
-	/**
-	 * Counts the number of files in the selection (leaf nodes only - Files -
-	 * not the directories/containers) <br>
-	 * Note that this makes no distinction about what type of files.
-	 * 
-	 * @return number of files
-	 */
-	@SuppressWarnings("unchecked")
-	protected int countFilesSelected() {
-		int count = 0;
-		// Get elements of a possible multiple selection
-		Iterator iter = this.selection.iterator();
-		while (iter.hasNext()) {
-			Object obj = (Object) iter.next();
-			// It can be a Project, Folder, File, etc...
-			if (obj instanceof IAdaptable) {
-				final IResource res = (IResource) ((IAdaptable) obj)
-						.getAdapter(IResource.class);
-				count = count + countFiles(res);
-			}
-		}
-		// System.out.println("number of files: " + count);
-		return count;
-	}
-
-	/**
-	 * Count the number of files in this resource (file or container).
-	 * 
-	 * @param res
-	 * @return
-	 */
-	protected int countFiles(IResource res) {
-		if (res instanceof IFile) {
-			return 1;
-		} else if (res instanceof IContainer) {
-			int count = 0;
-	
-			try {
-				IResource[] kids = ((IContainer) res).members();
-				for (int i = 0; i < kids.length; i++) {
-					IResource child = kids[i];
-					count = count + countFiles(child);
-				}
-				return count;
-			} catch (CoreException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		return 0;
-	}
-	 @SuppressWarnings("unchecked")
-	  protected int countFilesSelected(String[] exts) {
-	    int count = 0;
-	    // Get elements of a possible multiple selection
-	    Iterator iter = this.selection.iterator();
-	    while (iter.hasNext()) {
-	      Object obj = (Object) iter.next();
-	      // It can be a Project, Folder, File, etc...
-	      if (obj instanceof IAdaptable) {
-	        final IResource res = (IResource) ((IAdaptable) obj)
-	            .getAdapter(IResource.class);
-	        count = count + countFiles(res,exts);
-	      }
-	    }
-	    // System.out.println("number of files: " + count);
-	    return count;
-	  }
-	/**
-	 * count files ending in one of the given file extensions
-	 * 
-	 * @param res
-	 * @param exts array of extensions e.g. ".h", ".hpp" etc
-	 * @return
-	 */
-	protected int countFiles(IResource res, String[]exts) {
-	  if (res instanceof IFile) {
-	    IFile file = (IFile)res;
-	    String filename = file.getName();
-      for (int i = 0; i < exts.length; i++) {
-        String ext = exts[i];
-        if(filename.endsWith(ext)){
-          System.out.println("found "+ext+" in file: "+file.getName()+"  count+1"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-          return 1;
-        }
-      }
-        return 0;  // not found
-
-    } else if (res instanceof IContainer) {
-      int count = 0;
-  
-      try {
-        IResource[] kids = ((IContainer) res).members();
-        for (int i = 0; i < kids.length; i++) {
-          IResource child = kids[i];
-          count = count + countFiles(child,exts);
-        }
-        return count;
-      } catch (CoreException e) {
-        // TODO Auto-generated catch block
-        e.printStackTrace();
-      }
-    }
-    return 0;
-	}
-
-}
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/actions/RunAnalyseHandlerBase.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/actions/RunAnalyseHandlerBase.java
deleted file mode 100644
index 7f36f97..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/actions/RunAnalyseHandlerBase.java
+++ /dev/null

@@ -1,674 +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.common.actions;
-
-import java.lang.reflect.InvocationTargetException;
-import java.net.URI;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.cdt.core.CCorePlugin;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.index.IIndex;
-import org.eclipse.cdt.core.model.ICContainer;
-import org.eclipse.cdt.core.model.ICElement;
-import org.eclipse.cdt.core.model.ICProject;
-import org.eclipse.cdt.core.model.ITranslationUnit;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectNature;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.MessageDialogWithToggle;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ptp.pldt.common.Artifact;
-import org.eclipse.ptp.pldt.common.ArtifactMarkingVisitor;
-import org.eclipse.ptp.pldt.common.CommonPlugin;
-import org.eclipse.ptp.pldt.common.IDs;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.messages.Messages;
-import org.eclipse.ptp.pldt.common.util.AnalysisUtil;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IViewReference;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-
-/**
- * 
- * RunAnalyseBase - run analysis to create generic artifact markers. <br>
- * The analysis is done in the doArtifactAnalysis() method
- * 
- * @author Beth Tibbitts
- * 
- * IObjectActionDelegate enables popup menu selection <br>
- * IWindowActionDelegate enables toolbar(or menu) selection
- */
-
-public abstract class RunAnalyseHandlerBase extends RunAnalyseHandler {
-	protected static /*final*/ boolean traceOn = false;
-
-	/**
-	 * indent amount for each level of nesting; useful when printing debug
-	 * statements
-	 */
-	private static final int INDENT_INCR = 2;
-
-	protected boolean forceEcho = false;
-
-	protected IWorkbenchWindow window;
-
-	protected boolean cancelledByUser = false;
-
-	protected int cumulativeArtifacts = 0;
-
-	/** the type of artifact e.g. "MPI" or "OpenMP" */
-	protected String name;// = "MPI";
-
-	protected ArtifactMarkingVisitor visitor;
-
-	protected String markerID;
-
-	private boolean err = false;
-
-	protected Shell shell;
-
-	/**
-	 * Constructor for the "Run Analysis" action
-	 * 
-	 * @param name
-	 *            the type of artifact e.g. "MPI" or "OpenMP"
-	 * @param visitor
-	 *            the visitor that will put the markers on the source files
-	 * @param markerID
-	 *            marker ID
-	 */
-	public RunAnalyseHandlerBase(String name, ArtifactMarkingVisitor visitor,
-			String markerID) {
-		this.name = name;
-		this.visitor = visitor;
-		this.markerID = markerID;
-		
-		traceOn=CommonPlugin.getTraceOn();
-		if(traceOn)System.out.println("RunAnalyseBase.ctor: traceOn="+traceOn); //$NON-NLS-1$
-		
-		// get the navigator, project explorer, c/C++ projects view, etc
-		//need to get selectionChanged on that, to cache the most recent selection there,
-		// otherwise HanderUtil will tell us latest selection including ones we don't want
-		
-		
-		
-	}
-
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		if (traceOn)
-			System.out.println("RunAnalyseBase.setActivePart()..."); //$NON-NLS-1$
-		shell = targetPart.getSite().getShell();
-	}
-
-	/**
-	 * Do the "Run Analysis" on a resource (project, folder, or file).
-	 * Descends to all child nodes, collecting artifacts on each.
-	 * 
-	 */
-
-	public void run() {
-		if (traceOn)
-			System.out.println("RunAnalyseHandlerBase.run()..."); //$NON-NLS-1$
-
-		cancelledByUser = false;
-		err = false;
-		cumulativeArtifacts = 0;
-		readPreferences();
-
-		final int indent = 0;
- 
-		if ((selection == null) || selection.isEmpty()) {
-			MessageDialog
-					.openWarning(null, Messages.RunAnalyseHandlerBase_no_files_selected,
-							Messages.RunAnalyseHandlerBase_please_select);
-
-			return;
-		} else {
-			// get preference for include paths
-			final List<String> includes = getIncludePath();
-			if (areIncludePathsNeeded() && includes.isEmpty()) {
-				//System.out.println("RunAnalyseHandlerBase.run(), no include paths found.");
-				MessageDialog.openWarning(shell, name
-						+ Messages.RunAnalyseHandlerBase_include_paths_not_found,
-						Messages.RunAnalyseHandlerBase_please_first_specify + name
-								+ Messages.RunAnalyseHandlerBase_incl_paths_in_pref_page);
-
-			} else {
-
-				// batch ws modifications *and* report progress
-				WorkspaceModifyOperation wmo = new WorkspaceModifyOperation() {
-					@Override
-					protected void execute(IProgressMonitor monitor)
-							throws CoreException, InvocationTargetException,
-							InterruptedException {
-						err = runResources(monitor, indent, includes);
-					}
-				};
-				ProgressMonitorDialog pmdialog = new ProgressMonitorDialog(
-						shell);
-				try {
-					pmdialog.run(true, true, wmo); // fork=true; if false, not
-													// cancelable
-
-				} catch (InvocationTargetException e) {
-					err = true;
-					Throwable cause = e.getCause();
-					System.out.println("Error running analysis: ITE: " //$NON-NLS-1$
-							+ e.getMessage());
-					System.out.println("  cause: " + cause + " - " //$NON-NLS-1$ //$NON-NLS-2$
-							+ cause.getMessage());
-					
-					cause.printStackTrace();
-				} catch (InterruptedException e) {
-					cancelledByUser = true;
-				}
-
-			}// end else
-		}
-		if (traceOn)
-			System.out.println("RunAnalyseBase: retd from run iterator, err=" //$NON-NLS-1$
-					+ err);
-		String artsFound = "\nNumber of " + name + " Artifacts found: " //$NON-NLS-1$ //$NON-NLS-2$
-				+ cumulativeArtifacts;
-		if (cancelledByUser) {
-			MessageDialog.openInformation(null, Messages.RunAnalyseHandlerBase_partial_analysis_complete,
-					Messages.RunAnalyseHandlerBase_15
-							+ artsFound);
-		} else {
-			String msg = Messages.RunAnalyseHandlerBase_cancelled_by_user;
-			if (!err) {
-				String key = IDs.SHOW_ANALYSIS_CONFIRMATION;
-				IPreferenceStore pf = CommonPlugin.getDefault()
-						.getPreferenceStore();
-				boolean showDialog = pf
-						.getBoolean(IDs.SHOW_ANALYSIS_CONFIRMATION);
-				if (showDialog) {
-					String title = Messages.RunAnalyseHandlerBase_analysis_complete;
-					StringBuffer sMsg = new StringBuffer(cumulativeArtifacts + " " + name //$NON-NLS-1$
-							+ Messages.RunAnalyseHandlerBase_artifacts_found);
-					// provide some explanation of why perhaps no artifacts were found.
-					// Note: should this perhaps be in a "Details" section of the dialog?
-					if(cumulativeArtifacts==0) {
-						sMsg.append(Messages.RunAnalyseHandlerBase_20).append(name).append(Messages.RunAnalyseHandlerBase_21);
-						sMsg.append(name).append(Messages.RunAnalyseHandlerBase_22);
-						sMsg.append(Messages.RunAnalyseHandlerBase_23);
-					}
-					String togMsg = Messages.RunAnalyseHandlerBase_dont_show_this_again;
-					MessageDialogWithToggle.openInformation(shell, title, sMsg.toString(),
-							togMsg, false, pf, key);
-					showStatusMessage(sMsg.toString(), "RunAnalyseBase.run()"); //$NON-NLS-1$
-				}
-				activateProblemsView();
-				activateArtifactView();
-			} else { // error occurred
-				showStatusMessage(msg, "RunAnalyseBase.run() error"); //$NON-NLS-1$
-				msg = Messages.RunAnalyseHandlerBase_27;
-				MessageDialog.openError(null, Messages.RunAnalyseHandlerBase_28,
-						msg + artsFound);
-			}
-		}
-
-	}
-
-	/**
-	 * Run the analysis on the current selection (file, container, or
-	 * multiple-selection)
-	 * 
-	 * @param monitor
-	 *            progress monitor on which to report progress.
-	 * @param indent
-	 *            indent amount, in number of spaces, used only for debug
-	 *            printing.
-	 * @param includes
-	 * @return true if any errors were found.
-	 * @throws InterruptedException
-	 */
-	@SuppressWarnings("unchecked") // on Iterator
-	protected boolean runResources(IProgressMonitor monitor, int indent,
-			List<String> includes) throws InterruptedException {
-		boolean foundError = false;
-		// First, count files so we know how much work to do.
-		// note this is number of files of any type, not necessarily number of
-		// files that will be analyzed.
-		int count = countFilesSelected();
-
-		monitor.beginTask(Messages.RunAnalyseHandlerBase_29, count);
-		if(traceOn)System.out.println("RAHB.runResources(): using selection: "+selection);
-		// Get elements of a possible multiple selection
-		IStructuredSelection lastSel=AnalysisDropdownHandler.getInstance().getLastSelection();
-		Iterator<IStructuredSelection> iter=lastSel.iterator();// fix analysis selection bug 327122
-		
-		while (iter.hasNext()) {
-			if (monitor.isCanceled()) {
-				// this is usually caught here while processing
-				// multiple-selection of files
-				throw new InterruptedException();
-			}
-			Object obj = (Object) iter.next();// piece of selection
-			// It can be a Project, Folder, File, etc...
-			if (obj instanceof IAdaptable) {
-				// ICElement covers folders and translationunits
-				// If fortran file (*.f*) and Photran not installed, ce is null and we ignore it (first) here.
-				final ICElement ce = (ICElement) ((IAdaptable) obj)
-						.getAdapter(ICElement.class);// cdt40
-				if (ce != null) {
-					// cdt40
-					// IASTTranslationUnit atu = tu.getAST(); not yet
-					boolean err = runResource(monitor, ce, indent, includes);
-					if(traceOn)System.out.println("Error (err="+err+")running analysis on "+ce.getResource().getName()); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}
-		}
-		monitor.done();
-		return foundError;
-	}
-
-	abstract protected void activateArtifactView();
-
-	/**
-	 * If the analysis has an additional view to bring up, override this
-	 */
-	protected void activateProblemsView(){}
-
-	/**
-	 * Get the include path. Subclass should override this method.
-	 * 
-	 * @return
-	 */
-	abstract protected List<String> getIncludePath();
-
-	/**
-	 * Show something in the status line; this is used when we don't have easy
-	 * access to the view for getting the StatusLineManager.
-	 * 
-	 * @param message
-	 * @param debugMessage
-	 */
-	private void showStatusMessage(String message, String debugMessage) {
-		if (false) {
-			message += " - "; //$NON-NLS-1$
-			message += debugMessage;
-		}
-		IWorkbenchWindow ww = CommonPlugin.getDefault().getWorkbench()
-				.getActiveWorkbenchWindow();
-		IWorkbenchPage page = ww.getActivePage();
-		IViewReference[] viewRefs = page.getViewReferences();
-		for (int j = 0; j < viewRefs.length; j++) {
-			IViewReference reference = viewRefs[j];
-			IViewPart vp = reference.getView(false);
-			if (vp != null)
-				vp.getViewSite().getActionBars().getStatusLineManager()
-						.setMessage(message);
-		}
-
-	}
-
-	/**
-	 * Read preferences
-	 * 
-	 */
-	protected void readPreferences() {
-		Preferences pref = CommonPlugin.getDefault().getPluginPreferences();
-		forceEcho = pref.getBoolean(IDs.P_ECHO_FORCE);
-
-	}
-
-	/**
-	 * Run analysis on a resource (e.g. File or Folder) Will descend to members
-	 * of folder
-	 * 
-	 * @param atu
-	 *            the resource
-	 * @param indent
-	 *            number of levels of nesting/recursion for prettyprinting
-	 * @param includes
-	 *            contains header files include paths from the Preference page
-	 * @return true if an error was encountered
-	 * @throws InterruptedException
-	 */
-	public boolean runResource(IProgressMonitor monitor, ICElement ce,
-			int indent, List<String> includes) throws InterruptedException {
-		indent += INDENT_INCR;
-		ScanReturn results;
-		boolean foundError = false;
-
-		if (!monitor.isCanceled()) {
-			if (ce instanceof ITranslationUnit) {
-				IResource res = ce.getResource(); // null if not part of C
-													// project in ws
-				// cdt40: eventually shd be able to deal with just tu;
-				// tu.getResource() can always work later...
-				if (res instanceof IFile) {//shd always be true (but might be null)
-					IFile file = (IFile) res;
-					String filename = file.getName();
-					//String fn2 = ce.getElementName();// shd be filename too
-														// cdt40
-				    boolean cpp = isCPPproject(ce);
-				    //if (AnalysisUtil.validForAnalysis(filename,cpp)) {
-				    
-					if (validForAnalysis(filename,cpp)) {
-						if (traceOn)
-							println(getSpaces(indent) + "file: " + filename); //$NON-NLS-1$
-						results = analyse(monitor, (ITranslationUnit) ce,
-								includes);
-
-						foundError = foundError || results == null
-								|| results.wasError();
-						if (foundError) {
-							int stopHere = 0;
-							System.out.println("found error on " //$NON-NLS-1$
-									+ file.getName() + " " + stopHere); //$NON-NLS-1$
-						}
-						if (traceOn)
-							println("******** RunAnalyseBase, analysis complete; ScanReturn=" //$NON-NLS-1$
-									+ results);
-						if (results != null) {
-							// apply markers to the file
-							processResults(results, file);
-						}
-
-					} else {
-						if (traceOn)
-							println(getSpaces(indent)
-									+ "---omit: not valid file: " + filename); //$NON-NLS-1$
-					}
-					return foundError;
-				}
-			}
-
-			else if (ce instanceof ICContainer) {
-				ICContainer container = (ICContainer) ce;
-				try {
-					ICElement[] mems = container.getChildren();
-					for (int i = 0; i < mems.length; i++) {
-						if (monitor.isCanceled()) {
-							// this is usually hit while processing normal
-							// analysis of e.g. container
-							throw new InterruptedException();
-						}
-						boolean err = runResource(monitor, mems[i], indent,
-								includes);
-						foundError = foundError || err;
-					}
-				} catch (CoreException e) {
-					e.printStackTrace();
-				}
-				
-			}
-			else if (ce instanceof ICProject) {
-				ICProject proj = (ICProject) ce;
-				try {
-					ICElement[] mems = proj.getChildren();
-					for (int i = 0; i < mems.length; i++) {
-						if (monitor.isCanceled()) {
-							// this is usually hit while processing normal
-							// analysis of e.g. container
-							throw new InterruptedException();
-						}
-						boolean err = runResource(monitor, mems[i], indent,
-								includes);
-						foundError = foundError || err;
-					}
-				} catch (CoreException e) {
-					e.printStackTrace();
-				}			
-			}
-			// container could be project or folder		
-		} // end if !monitor.isCanceled()
-		else {
-			String name = ""; //$NON-NLS-1$
-			//cdt40
-				name = ce.getElementName();
-				//String p=ce.getPath().toString();
-			 
-			System.out.println("Cancelled by User, aborting analysis on subsequent files... " //$NON-NLS-1$
-							+ name);
-			throw new InterruptedException();
-		}
-
-		return foundError;
-	}
-/**
- * Determine if the project is a C++ project
- * @param ce the ICElement representing a file 
- * @return
- */
-  protected boolean isCPPproject(ICElement ce) {
-    IProject p = ce.getCProject().getProject();
-    try {
-      IProjectNature nature = p.getNature("org.eclipse.cdt.core.ccnature"); //$NON-NLS-1$
-      if(nature!=null) {
-        return true;
-      }
-    } catch (CoreException e) {
-      // TODO Auto-generated catch block
-      //e.printStackTrace();
-    }
-    return false;
-  }
-
-	protected void processResults(ScanReturn results, IResource resource) {
-		List<Artifact> artifacts = results.getArtifactList();
-		visitor.visitFile(resource, artifacts);
-	}
-
-
-
-	public ScanReturn analyse(IProgressMonitor monitor, ITranslationUnit tu,
-			List<String> includes) {
-		if (traceOn)
-			println("RunAnalyseBase.analyse()..."); //$NON-NLS-1$
-		//ScanReturn nr = null;
-		String errMsg = null;
-
-		monitor.subTask(Messages.RunAnalyseHandlerBase_42);
-
-		String rawPath = tu.getLocationURI().toString();
-		if (traceOn)
-			println("RunAnalyseBase:              file = " + rawPath); //$NON-NLS-1$
-
-		monitor.subTask(Messages.RunAnalyseHandlerBase_on + rawPath);
-
-		ScanReturn scanReturn = doArtifactAnalysis(tu, includes);
-		monitor.worked(1);
-		if (traceOn)
-			println("Artifact analysis complete..."); //$NON-NLS-1$
-		int numArtifacts = scanReturn.getArtifactList().size();
-		cumulativeArtifacts = cumulativeArtifacts + numArtifacts;
-
-		if (traceOn)
-			System.out.println("Artifacts found for " //$NON-NLS-1$
-					+ tu.getResource().getProjectRelativePath() + ": " + numArtifacts); //$NON-NLS-1$
-		if (traceOn)
-			System.out.println("   Total # found: " + cumulativeArtifacts); //$NON-NLS-1$
-
-		if (scanReturn == null) {
-			System.out.println("ScanReturn result is NULL.  No results for " //$NON-NLS-1$
-					+ tu.getResource().getProjectRelativePath());
-			errMsg = "Error: No results were returned from analysis of " //$NON-NLS-1$
-					+ tu.getResource().getProjectRelativePath();
-			MessageDialog.openError(shell, "Error in Analysis", errMsg); //$NON-NLS-1$
-		} else {
-			if (traceOn)
-				System.out.println("RunAnalyzeBase: ScanReturn received for " //$NON-NLS-1$
-						+ tu.getElementName());
-		}
-
-		if (scanReturn != null) {
-			boolean wasError = scanReturn.wasError();
-			if (traceOn)
-				System.out.println("error occurred =" + wasError); //$NON-NLS-1$
-			if (wasError) {
-				System.out.println("RunAnalyseBase.analyse...Error..."); //$NON-NLS-1$
-			}
-		}
-		return scanReturn;
-	}
-
-	/**
-	 * return a string of spaces of a certain length
-	 * 
-	 * @param indent
-	 *            the number of spaces to return (used for successively
-	 *            indenting debug statements based on depth of nesting)
-	 */
-	private static final String SPACES = "                                                                                            "; //$NON-NLS-1$
-
-	private String getSpaces(int indent) {
-		String indentSpace = ""; //$NON-NLS-1$
-		try {
-			indentSpace = SPACES.substring(0, indent);
-		} catch (StringIndexOutOfBoundsException e) {
-			println("RunAnalyseBase: Nesting level " + indent //$NON-NLS-1$
-					+ " exceeds print indent; INCR at each level is " //$NON-NLS-1$
-					+ INDENT_INCR);
-			// e.printStackTrace();
-		}
-		return indentSpace;
-	}
-
-	/**
-	 * print to log
-	 * 
-	 * @param str
-	 */
-	void println(String str) {
-		System.out.println(str);
-	}
-
-	/**
-	 * We can use this method to dispose of any system resources we previously
-	 * allocated.
-	 * 
-	 * @see IWorkbenchWindowActionDelegate#dispose implemented for toolbar
-	 *      enablement of this action
-	 */
-	public void dispose() {
-	}
-
-	/**
-	 * Cache the window object to be able to provide parent shell for the
-	 * message dialog.
-	 * 
-	 * @see IWorkbenchWindowActionDelegate#init implemented for toolbar
-	 *      enablement of this action NOTE: window object will thus be null for
-	 *      context menu use!! so...we are not using this, using
-	 *      Display.getCurrent() and Display.getCurrent().getActiveShell();
-	 */
-	public void init(IWorkbenchWindow window) {
-		this.window = window;
-	}
-
-	/**
-	 * Provide a human-readable version of what will be analyzed.
-	 * 
-	 * @param obj
-	 *            the file, folder, or project
-	 * @return a string indicating what it is
-	 */
-	public String getPrefacedName(Object obj) {
-		String preface = ""; //$NON-NLS-1$
-		if (obj instanceof IFolder)
-			preface = Messages.RunAnalyseHandlerBase_60;
-		else if (obj instanceof IProject)
-			preface = Messages.RunAnalyseHandlerBase_61;
-		else if (obj instanceof IFile)
-			preface = Messages.RunAnalyseHandlerBase_62;
-		String res = preface + ((IResource) obj).getName();
-		return res;
-	}
-
-	/**
-	 * Returns artifact analysis for file. <br>
-	 * Derived class should override this method.
-	 * 
-	 * @param tu
-	 * @param includes
-	 *            header files include paths
-	 * @return
-	 */
-	public abstract ScanReturn doArtifactAnalysis(final ITranslationUnit tu,
-			final List<String> includes);
-
-	/**
-	 * returns true if include paths must be set for this implementation. For
-	 * example, C needs include paths, but Fortran doesn't.
-	 */
-	public boolean areIncludePathsNeeded() {
-		return true;
-	}
-	
-	/**
-	 * Implemented for Handler; this replaces run() which is for actions.
-	 */
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		if(traceOn)System.out.println("RunAnalyseHandlerBase.execute()..."); //$NON-NLS-1$
-		getSelection(event);
-		if(traceOn)System.out.println("selection: "+selection); //$NON-NLS-1$
-		run();
-		AnalysisDropdownHandler.setLastHandledAnalysis(this, selection);
-	    return null;
-	}
-	
-	/**
-	 * Default determination of if a given filename is valid for our artifact analysis
-	 * @param filename
-	 * @param isCPP  is the project a C++ project or not
-	 * @return
-	 */
-	protected boolean validForAnalysis(String filename, boolean isCPP) {
-		return AnalysisUtil.validForAnalysis(filename,isCPP);
-	}
-
-  /**
-   * Get AST from index, not full tu
-   * @param tu translation unit from which to get the AST
-   * @return
-   */
-  protected IASTTranslationUnit getAST(ITranslationUnit tu) {
-    IIndex index;
-    try {
-      index = CCorePlugin.getIndexManager().getIndex(tu.getCProject());
-      IASTTranslationUnit ast = tu.getAST(index, ITranslationUnit.AST_SKIP_ALL_HEADERS);
-      //IASTTranslationUnit ast = tu.getAST(index, 0);
-      if(traceOn)System.out.println("    getAST(index,AST_SKIP_ALL_HEADERS)"); //$NON-NLS-1$
-      
-      return ast;
-    } catch (CoreException e) {
-      CommonPlugin.log(IStatus.ERROR,"RunAnalyseMPICommandHandler.getAST():Error getting AST (from index) for project "+tu.getCProject()); //$NON-NLS-1$
-      return null;
-    }
-    
-  }
-
-
-}
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/analysis/PldtAstVisitor.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/analysis/PldtAstVisitor.java
deleted file mode 100644
index 7443ca2..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/analysis/PldtAstVisitor.java
+++ /dev/null

@@ -1,576 +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.common.analysis;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.cdt.core.dom.IName;
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
-import org.eclipse.cdt.core.dom.ast.IASTIdExpression;
-import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
-import org.eclipse.cdt.core.dom.ast.IASTMacroExpansion;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTNodeLocation;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorMacroDefinition;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.ast.IBinding;
-import org.eclipse.cdt.core.dom.ast.c.CASTVisitor;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.MessageDialogWithToggle;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ptp.pldt.common.Artifact;
-import org.eclipse.ptp.pldt.common.CommonPlugin;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.messages.Messages;
-import org.eclipse.ptp.pldt.common.util.SourceInfo;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * This dom-walker helper collects interesting constructs (currently
- * function calls and constants), and adds markers to the source file for
- * C/C++ code. <br>
- * This base class encapsulates the common behaviors for both C and C++
- * code and for visitors looking for MPI, OpenMP, LAPI, etc. etc. types of artifacts
- * 
- * @author Beth Tibbitts
- * @since 4.0
- * 
- */
-public class PldtAstVisitor extends CASTVisitor {
-
-
-	/**
-	 * @since 4.0
-	 */
-	public static String ARTIFACT_CALL = "Artifact Call"; //$NON-NLS-1$
-	/**
-	 * @since 4.0
-	 */
-	public static String ARTIFACT_CONSTANT = "Artifact Constant"; //$NON-NLS-1$
-	protected static String ARTIFACT_NAME = "Artifact Name"; //$NON-NLS-1$
-	protected static String PREFIX = ""; //$NON-NLS-1$
-	private static /*final*/ boolean traceOn=false;
-	
-	private static boolean dontAskToModifyIncludePathAgain=false;
-	protected boolean allowPrefixOnlyMatch=false;
-
-	/**
-	 * List of include paths that we'll probably want to consider in the work that this visitor does.
-	 * For example, only paths found in this list (specified in PLDT preferences) would be considered
-	 * to be a path from which definitions of "Artifacts" would be found.
-	 * <br>
-	 * Note that this can now be dynamically modified during artifact analysis, thus no longer final
-	 */
-	private /*final*/ List<String> includes_;
-	private final String fileName;
-	private final ScanReturn scanReturn;
-
-	/**
-	 * 
-	 * @param includes
-	 *            list of include paths that we'll probably want to consider in
-	 *            the work that this visitor does
-	 * @param fileName
-	 *            the name of the file that this visitor is visiting(?)
-	 * @param prefixOnlyMatch
-	 *            if true, then artifact is recognized if it starts with the plugin-specific prefix
-	 *            (e.g. "MPI_"  etc.) instead of forcing a lookup of the location of the header file
-	 *            in which the API is found.  This proves to be difficult for users to get right, so prefix-only
-	 *            recognition of artifacts is allowed here.
-	 * @param scanReturn
-	 *            the ScanReturn object to which the artifacts that we find will
-	 *            be appended.
-
-	 */
-	public PldtAstVisitor(List<String> includes, String fileName, boolean prefixOnlyMatch, ScanReturn scanReturn ) {
-		this.includes_ = includes;
-		this.fileName = fileName;
-		this.scanReturn = scanReturn;
-		dontAskToModifyIncludePathAgain=false;
-		this.allowPrefixOnlyMatch=prefixOnlyMatch;
-		if(!traceOn) traceOn=CommonPlugin.getTraceOn();
-		if(traceOn)System.out.println("PldtAstVisitor, traceOn="+traceOn); //$NON-NLS-1$
-	}
-	/**
-	 * Constructor without prefixOnlyMatch arg, assumes false
-	 */
-	public PldtAstVisitor(List<String> includes, String fileName, ScanReturn scanReturn) {
-		this(includes, fileName, false, scanReturn);
-	}
-
-
-	/**
-	 * Skip statements that are included.
-	 */
-	public int visit(IASTStatement statement) { 
-		if (preprocessorIncluded(statement)) {
-			return ASTVisitor.PROCESS_SKIP;
-		}
-		return ASTVisitor.PROCESS_CONTINUE; 
-	}
-
-	/**
-	 * Skip decls that are included.
-	 * 
-	 * @param declaration
-	 * @return
-	 */
-	public int visit(IASTDeclaration declaration) {//called; both paths get taken
-		if (preprocessorIncluded(declaration)) {
-			return ASTVisitor.PROCESS_SKIP;
-		}
-		return ASTVisitor.PROCESS_CONTINUE;
-	}
-
-	/**
-	 * Process a function name from an expression and determine if it should be
-	 * marked as an Artifact. If so, append it to the scanReturn object that
-	 * this visitor is populating.
-	 * 
-	 * An artifact is a function name that was found in the MPI include path,
-	 * as defined in the MPI preferences.
-	 * 
-	 * @param astExpr
-	 * @param funcName
-	 */
-	public void processFuncName(IASTName funcName, IASTExpression astExpr) {
-		//IASTTranslationUnit tu = funcName.getTranslationUnit();
-		String strName=funcName.toString();
-		if ((this.allowPrefixOnlyMatch&&matchesPrefix(strName)) || isArtifact(funcName)) { // brt C++ test 2/16/10
-			SourceInfo sourceInfo = getSourceInfo(astExpr, Artifact.FUNCTION_CALL);
-			if (sourceInfo != null) {
-				if(traceOn) System.out.println("found artifact: " + funcName.toString()); //$NON-NLS-1$
-				// Note: we're determining the artifact name twice. (also in chooseName())
-				String artName=funcName.toString();
-				String rawName=funcName.getRawSignature();
-				//String bName=funcName.getBinding().getName();
-				if(!artName.equals(rawName)) {
-					if(rawName.length()==0)rawName="  "; //$NON-NLS-1$
-					artName=artName+"  ("+rawName+")"; // indicate orig pre-pre-processor value in parens //$NON-NLS-1$ //$NON-NLS-2$
-					// note: currently rawName seems to always be empty.
-				}
-					scanReturn.addArtifact(new Artifact(fileName, sourceInfo
-							.getStartingLine(), 1, artName, sourceInfo));
-				 
-			}
-		}
-	}
-
-	/**
-	 * 
-	 * @param astExpr
-	 */
-	public void processExprWithConstant(IASTExpression astExpr) {
-		IASTName funcName = ((IASTIdExpression) astExpr).getName();
-		//IASTTranslationUnit tu = funcName.getTranslationUnit();
-		String strName=funcName.toString();
-		if ((this.allowPrefixOnlyMatch&& matchesPrefix(strName)) || isArtifact(funcName)) {
-			SourceInfo sourceInfo = getSourceInfo(astExpr, Artifact.FUNCTION_CALL);
-			if (sourceInfo != null) {
-				//System.out.println("found MPI artifact: " + funcName.toString());
-				scanReturn.addArtifact(new Artifact(fileName, sourceInfo.getStartingLine(), 1,
-						funcName.toString(), sourceInfo));
-			}
-		}
-	}
-
-	/**
-	 * Determines if the funcName is an instance of the type of artifact in
-	 * which we are interested. <br>
-	 * An artifact is a function name that was found in the  include path (e.g. MPI or OpenMP),
-	 * as defined in the PLDT preferences.
-	 * 
-	 * @param funcName
-	 */
-	protected boolean isArtifact(IASTName funcName) {
-		IBinding binding = funcName.resolveBinding();
-		String name = binding.getName();
-		String rawSig = funcName.getRawSignature();
-		name = chooseName(name, rawSig);
-
-		IASTTranslationUnit tu = funcName.getTranslationUnit();
-
-		// Use index instead of full AST for the header file inclusion stuff
-		// Without full AST, further introspection into APIs will need to
-		// explicitly ask for it from the Index
-		IName[] names = tu.getDeclarations(binding); // get from the index not ast of e.g. header files
-		for (int i = 0; i < names.length; i++) {
-			IName name2 = names[i];
-			IASTFileLocation floc = name2.getFileLocation();
-			if (floc == null) {
-				if (traceOn)
-					System.out.println("PldtAstVisitor  IASTFileLocn null for "+ name2 + " (" + funcName + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				return false; // (e.g. 'ptr' )
-			}
-			String filename = floc.getFileName();
-			IPath path = new Path(filename);
-			if (isInIncludePath(path)) {
-				// System.out.println("    found "+path+"  in artifact path (via index)!");
-				return true;
-			} else {
-				if (traceOn) {
-					System.out.println(name+ " was found in "+ path+ " but  PLDT preferences have been set to only include: "+ includes_.toString()); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-				// add them here?
-				if (allowIncludePathAdd()) {
-					boolean addit = addIncludePath(path, name,dontAskToModifyIncludePathAgain);
-					if (addit)
-						return true;
-				}
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Choose how to distinguish between binding name, and raw signature.<br>
-	 * Could be overridden by subclasses if, for example, a name with a prefix e.g. "MPI::foo" should be preferred over "foo".<br>
-	 * Here, the default case is that we always choose the regular/binding name, unless it's empty, in which case we choose the rawSignature.
-	 * @param bindingName
-	 * @param rawSignature
-	 * @return
-	 */
-	protected String chooseName(String bindingName, String rawSignature){
-		String name=bindingName;
-		if(bindingName.length()==0) {
-			name=rawSignature;
-		}
-		return name;
-	}
- 
-	public void processMacroLiteral(IASTLiteralExpression expression) {
-		IASTNodeLocation[] locations = expression.getNodeLocations();
-		if ((locations.length == 1) && (locations[0] instanceof IASTMacroExpansion)) {//path taken &not
-			// found a macro, does it come from the include path required to be "one of ours"?
-			IASTMacroExpansion astMacroExpansion = (IASTMacroExpansion) locations[0];
-			IASTPreprocessorMacroDefinition preprocessorMacroDefinition = astMacroExpansion
-					.getMacroDefinition();
-			// String shortName =
-			// preprocessorMacroDefinition.getName().toString()+'='+literal;
-			String shortName = preprocessorMacroDefinition.getName().toString();
-			IASTNodeLocation[] preprocessorLocations = preprocessorMacroDefinition
-					.getNodeLocations();
-			while ((preprocessorLocations.length == 1)
-					&& (preprocessorLocations[0] instanceof IASTMacroExpansion)) {
-				preprocessorLocations = ((IASTMacroExpansion) preprocessorLocations[0])
-						.getMacroDefinition().getNodeLocations();
-			}
-
-			if ((preprocessorLocations.length == 1)
-					&& isInIncludePath(new Path(preprocessorLocations[0].asFileLocation()
-							.getFileName()))) {
-				SourceInfo sourceInfo = getSourceInfo(astMacroExpansion);
-				if (sourceInfo != null) {
-					scanReturn.addArtifact(new Artifact(fileName, sourceInfo.getStartingLine(), 1, // column:
-							shortName, sourceInfo));
-				}
-
-			}
-		}
-	}
-
-	/**
-	 * Is this path found in the include path in which we are interested?
-	 * E.g. is it in the  include path specified in PLDT preferences,
-	 * which would identify it as an  artifact of interest?
-	 * 
-	 * @param includeFilePath under consideration
-	 * @return true if this is found in the include path from PLDT preferences
-	 */
-	private boolean isInIncludePath(IPath includeFilePath) {
-		if (includeFilePath == null)
-			return false;
-		for (String includeDir : includes_) {
-			IPath includePath = new Path(includeDir);
-			if(traceOn)System.out.println("PldtAstVisitor: is "+includeFilePath+" found in "+includeDir+"?"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			if (includePath.isPrefixOf(includeFilePath))
-				return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Get exact source location info for a function call
-	 * 
-	 * @param astExpr
-	 * @param constructType
-	 * @return
-	 */
-	private SourceInfo getSourceInfo(IASTExpression astExpr, int constructType) {
-		SourceInfo sourceInfo = null;
-		IASTNodeLocation[] locations = astExpr.getNodeLocations();
-		if (locations.length == 1) {
-			IASTFileLocation astFileLocation = null;
-			if (locations[0] instanceof IASTFileLocation) {
-				astFileLocation = (IASTFileLocation) locations[0];
-			}
-			// handle the case e.g. #define foo MPI_fn - recognize foo() as MPI_fn()
-			else if (locations[0] instanceof IASTMacroExpansion) {
-				IASTMacroExpansion me=(IASTMacroExpansion)locations[0];
-				astFileLocation=me.asFileLocation();
-			}
-			if(astFileLocation!=null) {
-				sourceInfo = new SourceInfo();
-				sourceInfo.setStartingLine(astFileLocation.getStartingLineNumber());
-				sourceInfo.setStart(astFileLocation.getNodeOffset());
-				sourceInfo.setEnd(astFileLocation.getNodeOffset() + astFileLocation.getNodeLength());
-				sourceInfo.setConstructType(constructType);			
-			}
-		}
-		return sourceInfo;
-	}
-
-	/**
-	 * Get exact source location info for a constant originated from Macro
-	 * expansion(s)
-	 * 
-	 * @param iASTMacroExpansion
-	 *            represents the original macro
-	 * @return
-	 */
-	private SourceInfo getSourceInfo(IASTMacroExpansion iASTMacroExpansion) {
-		SourceInfo sourceInfo = null;
-		IASTFileLocation iASTFileLocation = iASTMacroExpansion.asFileLocation();
-		sourceInfo = new SourceInfo();
-		sourceInfo.setStartingLine(iASTFileLocation.getStartingLineNumber());
-		sourceInfo.setStart(iASTFileLocation.getNodeOffset());
-		sourceInfo.setEnd(iASTFileLocation.getNodeOffset() + iASTFileLocation.getNodeLength());
-		sourceInfo.setConstructType(Artifact.CONSTANT);
-
-		return sourceInfo;
-	}
-	
-	private boolean preprocessorIncluded(IASTNode astNode) {
-		if (astNode.getFileLocation() == null)
-			return false;
-		String location = astNode.getFileLocation().getFileName();
-		String tuFilePath = astNode.getTranslationUnit().getFilePath();
-		return !location.equals(tuFilePath);
-	}
-
-	public void processIdExprAsLiteral(IASTIdExpression expression) {
-		IASTName name = expression.getName();
-		String strName=name.toString();
-		if ((this.allowPrefixOnlyMatch&& matchesPrefix(strName)) || isArtifact(name)) {// brt C++ test 2/16/10
-			SourceInfo sourceInfo = getSourceInfo(expression, Artifact.CONSTANT);
-			if (sourceInfo != null) {
-				scanReturn.addArtifact(new Artifact(fileName, sourceInfo.getStartingLine(), 1, // column:
-						name.toString(), sourceInfo));
-			}
-		}
-	}
-
-	/**
-	 * allow dynamic adding to include path?  Can be overridden by derived classes.
-	 * @return
-	 */
-	public boolean allowIncludePathAdd() {
-		return !dontAskToModifyIncludePathAgain;
-	}
-	/**
-	 * Replace the includes list in this visitor so the change will be recognized.
-	 * @param includes
-	 */
-	@SuppressWarnings("unchecked")
-  protected void replaceIncludes(String includes) {
-		includes_=convertToList(includes);
-	}
-    @SuppressWarnings({ "unchecked"})
-	public List convertToList(String stringList)
-    {
-        StringTokenizer st = new StringTokenizer(stringList, File.pathSeparator + "\n\r");//$NON-NLS-1$
-        List dirs = new ArrayList();
-        while (st.hasMoreElements()) {
-            dirs.add(st.nextToken());
-        }
-        return dirs;
-    }
-	/** 
-	 * Add an include path to the prefs - probably found dynamically during analysis
-	 * and requested to be added by the user
-	 * <br>
-	 * Note that the path will be to the actual file in which the name was found;
-	 * the path that will be added to the prefs is the parent directory of that file.
-	 * @param path
-	 * @param name the name (function etc) that was found in the path
-	 * @param dontAskAgain  initial value of toggle "don't ask again"
-	 * 
-	 * @returns whether the user chose to add the path or not
-	 */
-	public boolean addIncludePath( IPath path,  String name/*, IPreferenceStore store, String id*/, boolean dontAskAgain) {
-
-		IPreferenceStore store=getPreferenceStore();
-		String id=getIncludesPrefID();
-		String type=getTypeName();
-		boolean doitThisTime=false;
-		
-		if(store==null || id == null) {
-			CommonPlugin.log(IStatus.ERROR, "PLDT: Visitor subclass does not implement getPreferenceStore() or "+ //$NON-NLS-1$
-					"getIncludesPrefID() to return non-null values."); //$NON-NLS-1$
-			return false;
-		}
-		
-		try {
-		 String value = store.getString(id);
-		if(traceOn)System.out.println("value: "+value); //$NON-NLS-1$
-		
-		if (!dontAskAgain) {
-        // probably inefficient string construction, but rarely called.
-        String msg = Messages.PldtAstVisitor_20
-            + name
-            + Messages.PldtAstVisitor_21
-            + path.toString()
-            + Messages.PldtAstVisitor_22
-            + type
-            + Messages.PldtAstVisitor_23
-            + value
-            + Messages.PldtAstVisitor_24;
-        String title = Messages.PldtAstVisitor_25 + type + Messages.PldtAstVisitor_26;
-        boolean[] twoAnswers = askUI(title, msg, dontAskToModifyIncludePathAgain);
-        doitThisTime = twoAnswers[0];
-        dontAskAgain = twoAnswers[1];
-        dontAskToModifyIncludePathAgain = dontAskAgain;
-      }
-
-      if (doitThisTime) {
-        String s = java.io.File.pathSeparator;
-        String parent = path.toFile().getParent();
-        // add path separator (: or ; ?) if necessary
-        if (!value.endsWith(s)) {
-          value += s;
-        }
-        // add this new include path location to the value stored in
-        // preferences, and add it to the value within this class as well.
-        value += parent + s;
-        store.putValue(id, value);
-        replaceIncludes(value);
-      }
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-		return doitThisTime;
-	}
-
-	/**
-	 * needs to be overrridden for derived classes that need to dynamically update the pref store 
-	 * e.g. for the includes path.  This type name is used for messages, etc.
-	 * @return artifact type name such as "MPI", "OpenMP" etc.
-	 */	
-	protected String getTypeName() {
-		return ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * needs to be overrridden for derived classes that need to dynamically update the pref store 
-	 * e.g. for the includes path
-	 * @return
-	 */
-	protected String getIncludesPrefID() {
-		return null;
-	}
-	/**
-	 * needs to be overrridden for derived classes that need to dynamically update the pref store 
-	 * e.g. for the includes path
-	 * @return
-	 */
-	protected IPreferenceStore getPreferenceStore() {
-		return null;
-	}
-
-
-	/**
-	 * Dialog to ask a question in the UI thread
-	 * @author beth
-	 *
-	 */	
-	public boolean[] askUI(final String title, final String message, boolean dontAskAgain) {
-	  boolean[] twoAnswers = new boolean[2];
-		RunGetAnswer runner = new RunGetAnswer(title,message,dontAskAgain);
-		
-		Display.getDefault().syncExec(runner);
-		boolean answer=runner.getAnswer();
-		dontAskAgain=runner.getDontAskAgain();
-		twoAnswers[0]=answer;
-		twoAnswers[1]=dontAskAgain;
-		return twoAnswers;
-	}
-	/**
-	 * Runnable used by askUI to ask a question in the UI thread
-	 * @author beth
-	 *
-	 */
-	  class RunGetAnswer implements Runnable {
-	    boolean answer, dontAskAgain;
-	    String title, message;
-
-	    RunGetAnswer(String title, String message, boolean initialToggleState) {
-	      this.title = title;
-	      this.message = message;
-	      this.dontAskAgain=initialToggleState;
-	    }
-
-	    public void run() {
-	      IWorkbench wb = PlatformUI.getWorkbench();
-	      IWorkbenchWindow w = wb.getActiveWorkbenchWindow();
-	      Shell shell = w.getShell();
-	      if (shell == null) {
-	        Display display = CommonPlugin.getStandardDisplay();
-	        shell = display.getActiveShell();
-	      }
-	      
-	      // see also: openYesNoCancelQuestion
-	      String toggleMessage=Messages.PldtAstVisitor_28;
-	      IPreferenceStore store = null;
-	      String key = null;
-	      MessageDialogWithToggle md;
-	      md=MessageDialogWithToggle.openYesNoQuestion(shell, title, message, toggleMessage, dontAskAgain, store, key);
-	      int retCode=md.getReturnCode();  // yes=2
-	      answer = (retCode==2);
-	      dontAskAgain= md.getToggleState();  
-	    }
-
-	    public boolean getAnswer() {
-	      return answer;
-	    }
-	    public boolean getDontAskAgain() {
-	      return dontAskAgain;
-	    }
-	  }
-
-	/**
-	 * will be overridden where needed; note that for C code, the test for if
-	 * the prefix matches has already been done before this is called so this
-	 * test isn't necessary. FIXME improve this convoluted logic
-	 * 
-	 * @param name
-	 * @return
-	 * @since 4.0
-	 */
-	  public boolean matchesPrefix(String name) {
-		  return true;
-	  }
-
-}
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/AllFunctions.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/AllFunctions.java
deleted file mode 100644
index e39595e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/AllFunctions.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005,2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.common.editorHelp;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.cdt.ui.IFunctionSummary;
-
-/**
- * Unused???? 3/13/08
- *
- */
-public class AllFunctions {
-	private List<IFunctionSummary> allFunctionList = new ArrayList<IFunctionSummary>();
-
-	public List<IFunctionSummary> getAllFunctionList() {
-		return allFunctionList;
-	}
-
-	public void setAllFunctionList(List<IFunctionSummary> allFunctionList) {
-		this.allFunctionList = allFunctionList;
-	}
-	
-	public void addFunction(IFunctionSummary functionSummary)
-	{
-		allFunctionList.add(functionSummary);
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/CHelpBookImpl.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/CHelpBookImpl.java
deleted file mode 100644
index 685a90a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/CHelpBookImpl.java
+++ /dev/null

@@ -1,113 +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.common.editorHelp;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.cdt.ui.ICHelpBook;
-import org.eclipse.cdt.ui.ICHelpResourceDescriptor;
-import org.eclipse.cdt.ui.IFunctionSummary;
-import org.eclipse.cdt.ui.text.ICHelpInvocationContext;
-import org.eclipse.ptp.pldt.common.messages.Messages;
-
-/**
- * C Help Book implementation for hover help, etc. etc.
- * @author Beth Tibbitts
- *
- */
-public class CHelpBookImpl implements ICHelpBook {
-	private String title = Messages.generic_c_help_book;
-	private static final boolean traceOn=false;
-
-	private String pluginId;
-
-	protected Map<String, IFunctionSummary> funcName2FuncInfo = new HashMap<String, IFunctionSummary>();
-
-	/**
-	 * Disallow default ctor; must provide plugin id
-	 */
-	@SuppressWarnings("unused")
-	private CHelpBookImpl() {
-	}
-
-	public CHelpBookImpl(String pluginId) {
-		this.pluginId = pluginId;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	protected void setTitle(String title) {
-		this.title = title;
-	}
-
-	public int getCHelpType() {
-		return ICHelpBook.HELP_TYPE_C;
-	}
-
-	public IFunctionSummary getFunctionInfo(ICHelpInvocationContext context,
-			String name) {
-		IFunctionSummary fs = funcName2FuncInfo.get(name);
-		if(traceOn){
-			
-			String cn=this.getClass().getSimpleName();
-			String finfo=(fs!=null)?(fs.toString().substring(0,25)):null;
-			if(finfo!=null)
-				System.out.println("CHelpBookImpl "+cn+" getFunctionInfo for "+name+ "= "+finfo); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		}
-		return fs;
-	}
-
-	public IFunctionSummary[] getMatchingFunctions(
-			ICHelpInvocationContext context, String prefix) {
-		List<IFunctionSummary> functionSummaryList = new ArrayList<IFunctionSummary>();
-		for (Iterator<String> it = funcName2FuncInfo.keySet().iterator(); it.hasNext();) {
-			String funcName = it.next();
-			if (funcName != null
-					&& funcName.toUpperCase().startsWith(prefix.toUpperCase())) {
-				functionSummaryList.add(funcName2FuncInfo.get(funcName));
-			}
-		}
-
-		IFunctionSummary[] functionSummaryArray = null;
-
-		// populate array
-		if (!functionSummaryList.isEmpty()) {
-			functionSummaryArray = new IFunctionSummary[functionSummaryList
-					.size()];
-			int i = 0;
-			for (Iterator<IFunctionSummary> it = functionSummaryList.iterator(); it.hasNext(); i++) {
-				functionSummaryArray[i] = it.next();
-			}
-		}
-
-		return functionSummaryArray;
-	}
-
-	public ICHelpResourceDescriptor[] getHelpResources(
-			ICHelpInvocationContext context, String name) {
-		IFunctionSummary functionSummary = getFunctionInfo(context, name);
-		if (functionSummary == null)
-			return null;
-
-		ICHelpResourceDescriptor resourceDescriptor[] = new ICHelpResourceDescriptor[1];
-		CHelpResourceDescriptorImpl hrd = new CHelpResourceDescriptorImpl(this,
-				functionSummary, this.pluginId);
-		resourceDescriptor[0] = hrd; // html file path is in here
-		return resourceDescriptor;
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/CHelpProviderImpl.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/CHelpProviderImpl.java
deleted file mode 100644
index 79b77b8..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/CHelpProviderImpl.java
+++ /dev/null

@@ -1,57 +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.common.editorHelp;
-
-import org.eclipse.cdt.ui.ICHelpBook;
-import org.eclipse.cdt.ui.ICHelpProvider;
-import org.eclipse.cdt.ui.ICHelpResourceDescriptor;
-import org.eclipse.cdt.ui.IFunctionSummary;
-import org.eclipse.cdt.ui.text.ICHelpInvocationContext;
-
-/**
- * 
- * This class implements ICHelpProvider and provides help information
- */
-public abstract class CHelpProviderImpl implements ICHelpProvider
-{
-    protected CHelpBookImpl helpBook;
-    
-
-
-    public ICHelpBook[] getCHelpBooks()
-    {
-        return new ICHelpBook[] {helpBook};
-    }
-
-    /**
-     * called on hover
-     */
-    public IFunctionSummary getFunctionInfo(ICHelpInvocationContext context, ICHelpBook[] helpBooks, String name)
-    {
-        return (helpBooks.length == 0) ? null : helpBook.getFunctionInfo(context, name);
-    }
-
-    public IFunctionSummary[] getMatchingFunctions(ICHelpInvocationContext context, ICHelpBook[] helpBooks,
-            String prefix)
-    {
-        return (helpBooks.length == 0) ? null : helpBook.getMatchingFunctions(context, prefix);
-    }
-
-    /**
-     * called on F1
-     */
-    public ICHelpResourceDescriptor[] getHelpResources(ICHelpInvocationContext context, ICHelpBook[] helpBooks,
-            String name)
-    {
-        return (helpBooks.length == 0) ? null : helpBook.getHelpResources(context, name);
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/CHelpResourceDescriptorImpl.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/CHelpResourceDescriptorImpl.java
deleted file mode 100644
index d8fa638..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/CHelpResourceDescriptorImpl.java
+++ /dev/null

@@ -1,101 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005,2010IBM 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.common.editorHelp;
-
-import java.net.URL;
-
-import org.eclipse.cdt.ui.ICHelpBook;
-import org.eclipse.cdt.ui.ICHelpResourceDescriptor;
-import org.eclipse.cdt.ui.IFunctionSummary;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.help.IHelpResource;
-import org.osgi.framework.Bundle;
-
-public class CHelpResourceDescriptorImpl implements ICHelpResourceDescriptor
-{
-    ICHelpBook  book;
-    String        name;
-    String        label;
-    String        href;
-    IHelpResource [] resources;
-
-    /**
-     * This is where the location of the html help file (to be displayed for an API) is located
-     * @param helpBook
-     * @param functionSummary
-     * @param pluginId
-     */
-    public CHelpResourceDescriptorImpl(ICHelpBook helpBook, IFunctionSummary functionSummary, String pluginId)
-    {
-        book = helpBook;
-        name = functionSummary.getName();
-        //href = "/"+pluginId + "/html/" + name + ".html";
-        StringBuffer buf=new StringBuffer();
-        
-		// Find where the html dir is located - could vary e.g. if a fragment
-		// provides "extra" info
-        String htmlLocn=findHTMLdir(pluginId);
-		buf.append("/").append(pluginId).append("/").append(htmlLocn).append("/").append(name).append(".html"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		href = buf.toString();
-        //System.out.println("looking for help file: "+href);
-        // href="file://c:/temp/foo.html";      
-        label = functionSummary.getPrototype().getPrototypeString(false);
-        resources = new IHelpResource[1];
-        resources[0] = new IHelpResource() {
-            public String getHref()
-            {
-                return href;
-            }
-
-            public String getLabel()
-            {
-                return label;
-            }
-        };
-    }
-
-    public ICHelpBook getCHelpBook()
-    {
-        return book;
-    }
-
-    public IHelpResource[] getHelpResources()
-    {
-        return resources;
-    }
-    public String toString() {
-    	return name+" -> "+href; //$NON-NLS-1$
-    }
-
-	/**
-	 * Workaraound to be able to recognize alternate html dir e.g. in a fragment
-	 * "add-on" plugin, to replace the html help files. 5.0 version will use an
-	 * extension point.
-	 * 
-	 * @param pluginId
-	 * @return
-	 */
-	private String findHTMLdir(String pluginId) {
-		String HTML_ALT_DIR = "html2";
-		// System.out.println("Looking or HTML dir for "+pluginId);
-    	Bundle bundle = Platform.getBundle(pluginId);
-		URL url = FileLocator.find(bundle, new Path(HTML_ALT_DIR), null);
-		if (url != null) {
-			return HTML_ALT_DIR;
-		} else {
-			return "html";
-		}
-
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/FunctionPrototypeSummaryImpl.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/FunctionPrototypeSummaryImpl.java
deleted file mode 100644
index a7ffc4a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/FunctionPrototypeSummaryImpl.java
+++ /dev/null

@@ -1,66 +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.common.editorHelp;
-
-import org.eclipse.cdt.ui.IFunctionSummary.IFunctionPrototypeSummary;
-
-public class FunctionPrototypeSummaryImpl implements IFunctionPrototypeSummary
-{
-    private String name;
-    private String returnType; // "void";
-    private String arguments; // "int argc, char** argv";
-
-    public FunctionPrototypeSummaryImpl()
-    {
-    	
-    }
-    
-    public FunctionPrototypeSummaryImpl(String name, String returnType, String arguments)
-    {
-        this.name = name;
-        this.returnType = returnType;
-        this.arguments = arguments;
-    }
-
-    public String getName()
-    {
-        return this.name;
-    }
-
-    public String getReturnType()
-    {
-        return returnType;
-    }
-
-    public String getArguments()
-    {
-        return arguments;
-    }
-
-    public String getPrototypeString(boolean namefirst)
-    {
-        return namefirst ? name + "(" + arguments + ") " + returnType : returnType + " " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-                + name + "(" + arguments + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-    }
-
-	public void setArguments(String arguments) {
-		this.arguments = arguments;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public void setReturnType(String returnType) {
-		this.returnType = returnType;
-	}
-}
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/FunctionSummaryImpl.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/FunctionSummaryImpl.java
deleted file mode 100644
index 9982c5f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/editorHelp/FunctionSummaryImpl.java
+++ /dev/null

@@ -1,103 +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.common.editorHelp;
-
-import org.eclipse.cdt.ui.IFunctionSummary;
-import org.eclipse.cdt.ui.IRequiredInclude;
-
-/**
- * Used by all four PLDT types MPI, OpenMP, LAPI and UPC, to create the structures that hover help needs
- * @author Beth Tibbitts
- *
- */
-public class FunctionSummaryImpl implements IFunctionSummary
-{
-    private String                    name;
-    private String                    namespace;
-    private String                    description;
-    private IFunctionPrototypeSummary prototype;
-    private IRequiredInclude[]        includes;
-
-    public FunctionSummaryImpl()
-    {
-    	
-    }
-    public FunctionSummaryImpl(String name, String namespace, String description,
-            IFunctionPrototypeSummary prototype, IRequiredInclude[] includes)
-    {
-        this.name = name;
-        this.namespace = namespace;
-        this.description = description;
-        this.prototype = prototype;
-        this.includes = includes;
-    }
-
-    public String getName()
-    {
-        return this.name;
-    }
-
-    public String getNamespace()
-    {
-        return this.namespace;
-    }
-
-    public String getDescription()
-    {
-        return this.description;
-    }
-
-    public IFunctionPrototypeSummary getPrototype()
-    {
-        return this.prototype;
-    }
-
-    public IRequiredInclude[] getIncludes()
-    {
-        return this.includes;
-    }
-
-    public void setDescription(String description)
-    {
-        this.description = description;
-    }
-
-    public void setIncludes(IRequiredInclude[] includes)
-    {
-        this.includes = includes;
-    }
-
-    public void setName(String name)
-    {
-        this.name = name;
-    }
-
-    public void setNamespace(String namespace)
-    {
-        this.namespace = namespace;
-    }
-
-    public void setPrototype(IFunctionPrototypeSummary prototype)
-    {
-        this.prototype = prototype;
-    }
-    
-    public String toString()
-    {
-        StringBuffer buf = new StringBuffer();
-        buf.append("name=").append(this.getName()).append('\n'); //$NON-NLS-1$
-        buf.append("namespace=").append(this.getNamespace()).append('\n'); //$NON-NLS-1$
-        buf.append("desc=").append(this.getDescription()).append('\n'); //$NON-NLS-1$
-        buf.append("..."); //$NON-NLS-1$
-        return buf.toString();
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/messages/Messages.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/messages/Messages.java
deleted file mode 100644
index 6439fb0..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/messages/Messages.java
+++ /dev/null

@@ -1,118 +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.common.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.pldt.common.messages.messages"; //$NON-NLS-1$
-	public static String Artifact_artifact;
-	public static String Artifact_constant;
-	public static String Artifact_function_call;
-	public static String Artifact_none;
-	public static String Artifact_pragma;
-	
-	public static String SimpleTableMarkerView_0;
-	public static String SimpleTableMarkerView_1;
-	public static String SimpleTableMarkerView_2;
-	public static String SimpleTableMarkerView_91;
-	public static String SimpleTableMarkerView_92;
-	public static String SimpleTableMarkerView_93;
-	public static String SimpleTableMarkerView_94;
-	public static String SimpleTableMarkerView_95;
-	public static String SimpleTableMarkerView_96;
-	public static String SimpleTableMarkerView_constant;
-	public static String SimpleTableMarkerView_description2;
-	public static String SimpleTableMarkerView_error;
-	public static String SimpleTableMarkerView_filename;
-	public static String SimpleTableMarkerView_filename2;
-	public static String SimpleTableMarkerView_function_call;
-	public static String SimpleTableMarkerView_information;
-	public static String SimpleTableMarkerView_lineno;
-	public static String SimpleTableMarkerView_lineno2;
-	public static String SimpleTableMarkerView_name2;
-	public static String SimpleTableMarkerView_no_info_avail;
-	public static String SimpleTableMarkerView_no;
-	public static String SimpleTableMarkerView_none;
-	public static String SimpleTableMarkerView_removeMarkers;
-	public static String SimpleTableMarkerView_removeMarkersTooltip;
-	public static String SimpleTableMarkerView_selected;
-	public static String SimpleTableMarkerView_showInfo;
-	public static String SimpleTableMarkerView_showInfoTooltip;
-	public static String SimpleTreeTableMarkerView_1;
-	public static String SimpleTreeTableMarkerView_2;
-	public static String SimpleTreeTableMarkerView_3;
-	public static String SimpleTreeTableMarkerView_83;
-	public static String SimpleTreeTableMarkerView_84;
-	public static String SimpleTreeTableMarkerView_85;
-	public static String SimpleTreeTableMarkerView_86;
-	public static String SimpleTreeTableMarkerView_87;
-	public static String SimpleTreeTableMarkerView_88;
-	public static String SimpleTreeTableMarkerView_constant;
-	public static String SimpleTreeTableMarkerView_description;
-	public static String SimpleTreeTableMarkerView_fileName;
-	public static String SimpleTreeTableMarkerView_function_call;
-	public static String SimpleTreeTableMarkerView_info;
-	public static String SimpleTreeTableMarkerView_line_no;
-	public static String SimpleTreeTableMarkerView_name;
-	public static String SimpleTreeTableMarkerView_No;
-	public static String SimpleTreeTableMarkerView_none;
-	public static String SimpleTreeTableMarkerView_selected;
-	public static String SimpleTreeTableMarkerView_show_info;
-	public static String SimpleTreeTableMarkerView_show_info_tooltip;
-	
-	public static String generic_c_help_book;
-	
-	public static String PldtAstVisitor_20;
-	public static String PldtAstVisitor_21;
-	public static String PldtAstVisitor_22;
-	public static String PldtAstVisitor_23;
-	public static String PldtAstVisitor_24;
-	public static String PldtAstVisitor_25;
-	public static String PldtAstVisitor_26;
-	public static String PldtAstVisitor_28;
-	
-	public static String AnalysisDropdownHandler_10;
-	public static String AnalysisDropdownHandler_9;
-	public static String RunAnalyseHandlerBase_15;
-	public static String RunAnalyseHandlerBase_20;
-	public static String RunAnalyseHandlerBase_21;
-	public static String RunAnalyseHandlerBase_22;
-	public static String RunAnalyseHandlerBase_23;
-	public static String RunAnalyseHandlerBase_27;
-	public static String RunAnalyseHandlerBase_28;
-	public static String RunAnalyseHandlerBase_29;
-	public static String RunAnalyseHandlerBase_42;
-	public static String RunAnalyseHandlerBase_60;
-	public static String RunAnalyseHandlerBase_61;
-	public static String RunAnalyseHandlerBase_62;
-	public static String RunAnalyseHandlerBase_analysis_complete;
-	public static String RunAnalyseHandlerBase_artifacts_found;
-	public static String RunAnalyseHandlerBase_cancelled_by_user;
-	public static String RunAnalyseHandlerBase_dont_show_this_again;
-	public static String RunAnalyseHandlerBase_incl_paths_in_pref_page;
-	public static String RunAnalyseHandlerBase_include_paths_not_found;
-	public static String RunAnalyseHandlerBase_no_files_selected;
-	public static String RunAnalyseHandlerBase_on;
-	public static String RunAnalyseHandlerBase_partial_analysis_complete;
-	public static String RunAnalyseHandlerBase_please_first_specify;
-	public static String RunAnalyseHandlerBase_please_select;
-	public static String PLDTPreferencePage_ptp_par_lang_dev_tools;
-	public static String PLDTPreferencePage_show_confirmation_q;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/messages/messages.properties b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/messages/messages.properties
deleted file mode 100644
index 41a349a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/messages/messages.properties
+++ /dev/null

@@ -1,92 +0,0 @@
-Artifact_artifact=Artifact: 
-Artifact_constant=Constant
-Artifact_function_call=Function Call
-Artifact_none=None
-Artifact_pragma=Pragma
-
-SimpleTableMarkerView_0=Artifact
-SimpleTableMarkerView_1=Artifacts
-SimpleTableMarkerView_2=Value
-SimpleTableMarkerView_91=Filter 
-SimpleTableMarkerView_92=\nDetermine which 
-SimpleTableMarkerView_93=\ are shown in this view.
-SimpleTableMarkerView_94=Filter 
-SimpleTableMarkerView_95=Filter which 
-SimpleTableMarkerView_96=\ are shown in this view
-SimpleTableMarkerView_constant=Constant
-SimpleTableMarkerView_description2=\nDescription: 
-SimpleTableMarkerView_error=(error)
-SimpleTableMarkerView_filename=Filename
-SimpleTableMarkerView_filename2=\nFile name: 
-SimpleTableMarkerView_function_call=Function Call
-SimpleTableMarkerView_information=\ information
-SimpleTableMarkerView_lineno=LineNo
-SimpleTableMarkerView_lineno2=\nLine number: 
-SimpleTableMarkerView_name2=\nName: 
-SimpleTableMarkerView_no=No 
-SimpleTableMarkerView_no_info_avail=\nNo information available.
-SimpleTableMarkerView_none=None
-SimpleTableMarkerView_removeMarkers=Remove Markers
-SimpleTableMarkerView_removeMarkersTooltip=Remove Markers
-SimpleTableMarkerView_selected=\ selected.
-SimpleTableMarkerView_showInfo=Show Info
-SimpleTableMarkerView_showInfoTooltip=Show detailed info for selected 
-SimpleTreeTableMarkerView_1=Artifact
-SimpleTreeTableMarkerView_2=Artifacts
-SimpleTreeTableMarkerView_3=Value
-SimpleTreeTableMarkerView_83=Filter 
-SimpleTreeTableMarkerView_84=\nDetermine which 
-SimpleTreeTableMarkerView_85=\ are shown in this view.
-SimpleTreeTableMarkerView_86=Filter 
-SimpleTreeTableMarkerView_87=Filter which 
-SimpleTreeTableMarkerView_88=\ are shown in this view
-SimpleTreeTableMarkerView_constant=Constant
-SimpleTreeTableMarkerView_description=\nDescription: 
-SimpleTreeTableMarkerView_fileName=\nFile name: 
-SimpleTreeTableMarkerView_function_call=Function Call
-SimpleTreeTableMarkerView_info=\ information
-SimpleTreeTableMarkerView_line_no=\nLine number: 
-SimpleTreeTableMarkerView_name=\nName: 
-SimpleTreeTableMarkerView_No=No 
-SimpleTreeTableMarkerView_none=None
-SimpleTreeTableMarkerView_selected=\ selected.
-SimpleTreeTableMarkerView_show_info=Show Info
-SimpleTreeTableMarkerView_show_info_tooltip=Show detailed info for selected 
-generic_c_help_book=Generic C Help Book
-PldtAstVisitor_20=The following API: \n  
-PldtAstVisitor_21=\nwas found in the following path: \n  
-PldtAstVisitor_22=\nwhich is not in the 
-PldtAstVisitor_23=\ preferences path list of: \n  
-PldtAstVisitor_24=.\nDo you want to add it?  If so, further APIs found here will be automatically recognized.
-PldtAstVisitor_25=Add 
-PldtAstVisitor_26=\ include path?
-PldtAstVisitor_28=Don't ask again
-
-AnalysisDropdownHandler_10=Repeat Analysis
-AnalysisDropdownHandler_9=No analysis has been done yet to repeat.
-RunAnalyseHandlerBase_15=Partial Analysis complete.  Cancelled by User.
-RunAnalyseHandlerBase_20=\n\n
-RunAnalyseHandlerBase_21=\ Artifacts are defined as APIs found in the include path specified in the 
-RunAnalyseHandlerBase_22=\ preferences.  The same include path should be present in the project properties, 
-RunAnalyseHandlerBase_23=regardless of whether or not a build command (e.g. mpicc) implicitly does this for compilation.
-RunAnalyseHandlerBase_27=Analysis completed with errors
-RunAnalyseHandlerBase_28=Analysis completed with errors
-RunAnalyseHandlerBase_29=Analysis
-RunAnalyseHandlerBase_42=Starting Analysis...
-RunAnalyseHandlerBase_on=\ on 
-RunAnalyseHandlerBase_60=Contents of Folder: 
-RunAnalyseHandlerBase_61=Contents of Project: 
-RunAnalyseHandlerBase_62=Source file: 
-RunAnalyseHandlerBase_analysis_complete=Analysis complete.
-RunAnalyseHandlerBase_artifacts_found=\ Artifacts found
-RunAnalyseHandlerBase_cancelled_by_user=***Analysis is complete.
-RunAnalyseHandlerBase_dont_show_this_again=Don't show me this again
-RunAnalyseHandlerBase_incl_paths_in_pref_page=\ include paths in the Preferences page.
-RunAnalyseHandlerBase_include_paths_not_found=\ Include Paths Not Found
-RunAnalyseHandlerBase_no_files_selected=No files selected for analysis.
-RunAnalyseHandlerBase_partial_analysis_complete=Partial Analysis Complete.
-RunAnalyseHandlerBase_please_first_specify=Please first specify the 
-RunAnalyseHandlerBase_please_select=Please select a source file or container (folder or project) to analyze.
-PLDTPreferencePage_ptp_par_lang_dev_tools=PTP Parallel Language Development Tools
-PLDTPreferencePage_show_confirmation_q=Show Analysis Confirmation with count of number of artifacts found
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/prefs/PLDTPreferencePage.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/prefs/PLDTPreferencePage.java
deleted file mode 100644
index dff4ca4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/prefs/PLDTPreferencePage.java
+++ /dev/null

@@ -1,65 +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.common.prefs;
-
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.ptp.pldt.common.CommonPlugin;
-import org.eclipse.ptp.pldt.common.IDs;
-import org.eclipse.ptp.pldt.common.messages.Messages;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-/**
- * This class represents a preference page that
- * is contributed to the Preferences dialog. By 
- * subclassing <samp>FieldEditorPreferencePage</samp>, we
- * can use the field support built into JFace that allows
- * us to create a page that is small and knows how to 
- * save, restore and apply itself.
- * <p>
- * This page is used to modify preferences only. They
- * are stored in the preference store that belongs to
- * the main plug-in class. That way, preferences can
- * be accessed directly via the preference store.
- */
-
-public class PLDTPreferencePage
-	extends FieldEditorPreferencePage
-	implements IWorkbenchPreferencePage {
-
-	public PLDTPreferencePage() {
-		super(GRID);
-		setPreferenceStore(CommonPlugin.getDefault().getPreferenceStore());
-		setDescription(Messages.PLDTPreferencePage_ptp_par_lang_dev_tools);
-	}
-	
-	/**
-	 * Creates the field editors. Field editors are abstractions of
-	 * the common GUI blocks needed to manipulate various types
-	 * of preferences. Each field editor knows how to save and
-	 * restore itself.
-	 */
-	public void createFieldEditors() {
-		String conf = Messages.PLDTPreferencePage_show_confirmation_q;
-        BooleanFieldEditor bed = new BooleanFieldEditor(IDs.SHOW_ANALYSIS_CONFIRMATION,conf,getFieldEditorParent());
-        //StringFieldEditor sed = new StringFieldEditor(MpiIDs.MPI_BUILD_CMD, MPI_BUILD_COMMAND_LABEL,getFieldEditorParent());
-        addField(bed);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
-	 */
-	public void init(IWorkbench workbench) {
-	}
-	
-}
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/prefs/PreferenceConstants.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/prefs/PreferenceConstants.java
deleted file mode 100644
index 4df8b97..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/prefs/PreferenceConstants.java
+++ /dev/null

@@ -1,26 +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.common.prefs;
-
-/**
- * Constant definitions for plug-in preferences
- */
-public class PreferenceConstants {
-
-	public static final String P_PATH = "pathPreference"; //$NON-NLS-1$
-
-	public static final String P_BOOLEAN = "booleanPreference"; //$NON-NLS-1$
-
-	public static final String P_CHOICE = "choicePreference"; //$NON-NLS-1$
-
-	public static final String P_STRING = "stringPreference"; //$NON-NLS-1$
-	
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/prefs/PreferenceInitializer.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/prefs/PreferenceInitializer.java
deleted file mode 100644
index 591d645..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/prefs/PreferenceInitializer.java
+++ /dev/null

@@ -1,31 +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.common.prefs;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-
-/**
- * Class used to initialize default preference values.
- */
-public class PreferenceInitializer extends AbstractPreferenceInitializer {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
-	 */
-	public void initializeDefaultPreferences() {
-//		IPreferenceStore store = CommonPlugin.getDefault()
-//				.getPreferenceStore();
-
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/util/AnalysisUtil.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/util/AnalysisUtil.java
deleted file mode 100644
index b466666..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/util/AnalysisUtil.java
+++ /dev/null

@@ -1,83 +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.common.util;
-
-import org.eclipse.cdt.core.CCorePlugin;
-import org.eclipse.cdt.core.parser.ParserLanguage;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.content.IContentType;
-
-/**
- * Various utility methods for project
- * 
- * @author Beth Tibbitts
- * 
- * 
- */
-public class AnalysisUtil {
- 
-	private AnalysisUtil() {
-		super();
-	}
-
-	/**
-	 * Is the given filename a valid file for analysis processing? <br>
-	 * Currently this means, is it a .c or .cpp etc file, or .h or .hpp? <br>
-	 * Don't pollute this with fortran info - currently fortran processing is in
-	 * a completely different action.
-	 * 
-	 * @param filename
-	 * @return
-	 */
-	public static boolean validForAnalysis(String filename, boolean isCPP) {
-		int loc = filename.lastIndexOf("."); //$NON-NLS-1$
-		if (loc <= 0) // if no dot, or filename is ".foo", not valid for
-						// analysis.
-			return false;
-		String ext = filename.substring(loc + 1);
-		ext = ext.toLowerCase();
-		boolean result = false;
-		if (ext.startsWith("c") ||ext.startsWith("f") ) // c or fortran //$NON-NLS-1$ //$NON-NLS-2$
-			result = true;
-		else
-			if(isCPP && ext.startsWith("h")) // C++ can have code in header files //$NON-NLS-1$
-			  result=true;
-		return result;
-	}
-
-	/**
-	 * Given a C/C++ source, decide if it is C or C++.
-	 * 
-	 * @param file
-	 *            must be either C or CPP file
-	 * @return
-	 */
-	public static ParserLanguage getLanguageFromFile(IFile file) {
-		if (file == null) { // assume CPP
-			return ParserLanguage.CPP;
-		}
-
-		IProject project = file.getProject();
-		String lid = null;
-		IContentType type = CCorePlugin.getContentType(project, file.getFullPath().lastSegment());
-		if (type != null) {
-			lid = type.getId();
-		}
-		if (lid != null
-				&& (lid.equals(CCorePlugin.CONTENT_TYPE_CXXSOURCE) || lid.equals(CCorePlugin.CONTENT_TYPE_CXXHEADER))) {
-			return ParserLanguage.CPP;
-		}
-
-		return ParserLanguage.C;
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/util/SourceInfo.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/util/SourceInfo.java
deleted file mode 100644
index ecb5c37..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/util/SourceInfo.java
+++ /dev/null

@@ -1,124 +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.common.util;
-
-import org.eclipse.ptp.pldt.common.Artifact;
-
-/**
- * Class encapsulates locational information for creating  markers representing Artifacts.
- * 
- * 
- */
-public class SourceInfo
-{
-	/** starting line location within in the file */
-    private int startingLine;
-    /** line number within the file */
-    private int start;
-    /** end position (character position) relative to start of file */
-    private int end;
-    /** type of construct, e.g. Artifact.CONSTANT, etc. */
-    private int constructType;
-
-    /** explicit default contstructor with no info; assumed to
-     * be filled in with set methods.
-     *
-     */
-    public SourceInfo(){
-    }
-    
-    /** ctor with info already filled in */
-    public SourceInfo(int startLine, int start, int end, int construct){
-    	this.startingLine=startLine;
-    	this.start=start;
-    	this.end=end;
-    	this.constructType=construct;
-    }
-    /**
-     * @return Returns the end position, relative to start of file
-     */
-    public int getEnd()
-    {
-        return end;
-    }
-
-    /**
-     * @param end The end to set.
-     */
-    public void setEnd(int end)
-    {
-        this.end = end;
-    }
-
-    /**
-     * @return Returns the start position, relative to start of file
-     */
-    public int getStart()
-    {
-        return start;
-    }
-
-    /**
-     * @param start The start to set.
-     */
-    public void setStart(int start)
-    {
-        this.start = start;
-    }
-
-    /**
-     * @return Returns the startingLine.
-     */
-    public int getStartingLine()
-    {
-        return startingLine;
-    }
-
-    /**
-     * @param startingLine The startingLine to set.
-     */
-    public void setStartingLine(int startingLine)
-    {
-        this.startingLine = startingLine;
-    }
-
-    /**
-     * @return Returns the constructType.
-     */
-    public int getConstructType()
-    {
-        return constructType;
-    }
-
-    /**
-     * @param constructType The constructType to set.
-     */
-    public void setConstructType(int constructType)
-    {
-        this.constructType = constructType;
-    }
-    /**
-     * A string representation of the object
-     */
-	public String toString() {
-		StringBuffer s = new StringBuffer();
-		s.append("SourceInfo line:").append(getStartingLine()); //$NON-NLS-1$
-		s.append(" startPos:").append(getStart()); //$NON-NLS-1$
-		s.append(" endPos:").append(getEnd()); //$NON-NLS-1$
-		int type = getConstructType();
-		s.append(" constructType:").append(type); //$NON-NLS-1$
-		try {
-			s.append(" ").append(Artifact.CONSTRUCT_TYPE_NAMES[type]);
-		} catch (Exception e) {
-		}
-		return s.toString();
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/util/Utility.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/util/Utility.java
deleted file mode 100644
index 5974b9f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/util/Utility.java
+++ /dev/null

@@ -1,157 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006, 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.common.util;
-
-import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTNodeLocation;
-import org.eclipse.cdt.core.parser.ParserUtil;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-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.jface.text.IDocument;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPathEditorInput;
-import org.eclipse.ui.editors.text.ILocationProvider;
-import org.eclipse.ui.editors.text.TextFileDocumentProvider;
-import org.eclipse.ui.ide.ResourceUtil;
-import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * Various function/methods of use, Originally in OpenMP analysis but used more generally now
- * 
- * @author pazel
- *
- */
-public class Utility
-{
-    
-    
-    /**
-     * compute the location relative to file, ignoring includes
-     * @param node - IASTNode
-     * @return Location
-     */
-    @SuppressWarnings("restriction")// need getLength() from ASTNode (as opposed to IASTNode)
-	public static Location getLocation(IASTNode node)
-    {
-        ASTNode astnode = (node instanceof ASTNode ? (ASTNode)node : null);
-        if (astnode==null)  return null;
-
-        IASTFileLocation ifl         = node.getFileLocation();
-        // offset calculation is tricky - we used the following since it seems to cover the most cases
-        int offset = 0;
-        int length = 0;
-        if (ifl!=null) {
-            offset = ifl.getNodeOffset();   
-            length = ifl.getNodeLength();
-        }
-        else {  // this happens in "omp sections", apparently due to pragmas splitting the region
-            IASTNodeLocation [] locs = node.getNodeLocations(); 
-            if (locs==null || locs.length==0)  return null;
-            offset = locs[0].getNodeOffset();
-            length = astnode.getLength();
-        }
-        return new Location(node, offset, offset+length-1);
-    }
-
-    //-------------------------------------------------------------------------
-    // Member
-    //-------------------------------------------------------------------------
-    public static class Location
-    {
-        public IASTNode node_ = null;
-        public int low_=0;
-        public int high_=0;
-    
-        public Location(IASTNode node, int low, int high)
-        {
-            node_ = node;
-            low_  = low;
-            high_ = high;
-        }
-        
-        public int getLow()  { return low_;  }
-        public int getHigh() { return high_; }
-    }
-    
- 
-    
-    /**
-     * get document using full path name
-     * @param fullPathName - String
-     * @return IDocument
-     */
-    public static IDocument getDocument(String fullPathName)
-    {
-        IResource r = ParserUtil.getResourceForFilename(fullPathName);
-        IFile     f = (r instanceof IFile ? (IFile)r : null);
-        if (f==null)  return null;
-        return getDocument(f);
-    }
-    
-    /**
-     * getDocument - get document using IFile - now no longer depends on text buffer; can return IDocument
-     * even for a file that is not open in editor (and thus not in textbuffer)
-     * @param file - IFile
-     * @return IDocument
-     */
-	public static IDocument getDocument(IFile file) {
-		IDocument document = null;
-
-		IDocumentProvider provider = new TextFileDocumentProvider();
-		try {
-			provider.connect(file);
-		} catch (CoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		document = provider.getDocument(file);
-
-		return document;
-	}
-	/**
-	 * From an editor, determine the file (absolute path name) open in the editor.
-	 * @param editor
-	 * @return null if none, but the string of the absolute file system location if available
-	 * 
-	 */
-    //cdt40 since editor.getInputFile() is now missing, this compensates
-	public static String getInputFile(ITextEditor editor) {
-		IEditorInput input= editor.getEditorInput();
-		if (input == null) {
-			return null;
-		}
-		IFile file= ResourceUtil.getFile(input);
-		if (file != null) {
-			return file.getLocation().toOSString();
-		}
-		if (input instanceof IPathEditorInput) {
-			IPath location= ((IPathEditorInput)input).getPath();
-			if (location != null) {
-				return location.toOSString();
-			}
-		}
-		ILocationProvider locationProvider= (ILocationProvider)input.getAdapter(ILocationProvider.class);
-		if (locationProvider != null) {
-			IPath location= locationProvider.getPath(input);
-			if (location != null) {
-				return location.toOSString();
-			}
-		}
-		return null;
-	}
-
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/util/ViewActivater.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/util/ViewActivater.java
deleted file mode 100644
index 7e79d49..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/util/ViewActivater.java
+++ /dev/null

@@ -1,40 +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.common.util;
-
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @deprecated Replaced by the more properly spelled {@link ViewActivator}
- */
-@Deprecated
-public class ViewActivater
-{
-    /**
-     * Activate the view identified by the view id.
-     * 
-     * @param strViewId
-     */
-    public static void activateView(String strViewId)
-    {
-        assert strViewId!=null;
-        IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-        try {
-            page.showView(strViewId);
-        } catch (PartInitException e) {
-            e.printStackTrace();
-        }
-        // page.activate(page.findView(strViewId));
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/util/ViewActivator.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/util/ViewActivator.java
deleted file mode 100644
index 421a49e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/util/ViewActivator.java
+++ /dev/null

@@ -1,40 +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.common.util;
-
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @since 4.0
- * 
- */
-public class ViewActivator
-{
-    /**
-     * Activate the view identified by the view id.
-     * 
-     * @param strViewId
-     */
-    public static void activateView(String strViewId)
-    {
-        assert strViewId!=null;
-        IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-        try {
-            page.showView(strViewId);
-        } catch (PartInitException e) {
-            e.printStackTrace();
-        }
-        // page.activate(page.findView(strViewId));
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/views/SimpleTableMarkerView.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/views/SimpleTableMarkerView.java
deleted file mode 100644
index e738b43..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/views/SimpleTableMarkerView.java
+++ /dev/null

@@ -1,1769 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,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.common.views;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IMarkerDelta;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.ptp.pldt.common.ArtifactManager;
-import org.eclipse.ptp.pldt.common.CommonPlugin;
-import org.eclipse.ptp.pldt.common.IArtifact;
-import org.eclipse.ptp.pldt.common.IDs;
-import org.eclipse.ptp.pldt.common.messages.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.ui.texteditor.MarkerUtilities;
-import org.osgi.framework.Bundle;
-
-/**
- * This view shows generic artifacts, represented by a marker, that are found in
- * a (source) file. <br>
- * It provides information and actions. The object model is the marker.
- * 
- * It provides standard columns of name, filename, lineNo, and one more. <br>
- * Names and last column name provided on ctor. Intended for quick reuse.
- * 
- * All information comes from the marker. Artifact objects containing arbitrary
- * information can be used (not extensively tested here yet).
- * 
- * 
- */
-public class SimpleTableMarkerView extends ViewPart {
-	protected TableViewer viewer;
-
-	protected Action infoAction;
-	protected Action removeMarkerAction;
-
-	private Action filterAction;
-
-	private Action doubleClickAction;
-
-	private static final boolean traceOn = false;
-
-	private static final boolean traceStatusLine = false;
-
-	protected ViewerSorter nameSorter;
-
-	protected GenericSorter lineNoSorter;
-
-	protected FilenameSorter filenameSorter;
-
-	protected GenericSorter orderSorter; // by "icon"
-
-	protected GenericSorter nameArtifactSorter;
-
-	protected GenericSorter constructSorter;
-
-	private IMarker selectedMarker_ = null;
-
-	/**
-	 * List of artifacts that were changed due to some action upon them in the
-	 * view (currently unused)
-	 */
-	protected StackList changedArts_ = new StackList();
-
-	/**
-	 * List of markers that were involved in a change on the the associated
-	 * artifact due to some action upon them here in the view (currently unused)
-	 */
-	protected StackList changedMarkers_ = new StackList();
-
-	protected UpdateVisitor visitor_ = new UpdateVisitor();
-
-	/**
-	 * Be consistent about what we call these things; generic values (can be)
-	 * replaced on ctor. <br>
-	 * These are read from plugin.xml if not passed on ctor
-	 */
-	protected String thingname_ = Messages.SimpleTableMarkerView_0;
-
-	protected String thingnames_ = Messages.SimpleTableMarkerView_1;
-
-	private String columnName_ = Messages.SimpleTableMarkerView_2;
-
-	private AbstractUIPlugin thePlugin_;
-
-	private String iconName_ = "icons/sample.gif"; //$NON-NLS-1$
-
-	private String viewName_;
-
-	private String[] markerIDs_;
-
-	private String[] columnNames_;
-
-	private String[] markerAttrNames_;
-
-	/**
-	 * The ID used in the marker for the unique ID for each artifact. Enables
-	 * mapping back to the Artifact object if necessary.
-	 */
-	protected String uniqueID_ = IDs.UNIQUE_ID;
-
-	/**
-	 * The ID used in the marker for the extra column of information (last
-	 * column)
-	 */
-	protected String columnID_ = "constructType"; // id for (variable) //$NON-NLS-1$
-
-	/** Marker ID for artifact name - e.g. API name, pragma name, etc. */
-	protected static final String NAME = "name"; //$NON-NLS-1$
-
-	/** Marker ID for storage of the filename in which the artifact is found */
-	protected static final String FILENAME = "filename"; //$NON-NLS-1$
-
-	/**
-	 * Marker id for storage of line number on which the artifact is found.
-	 * Reuse of default ID used by IMarker, repeated here for ease of use and
-	 * for clarity that THIS is the marker ID for line number.
-	 */
-	protected static final String LINE = IMarker.LINE_NUMBER;
-
-	/** Marker id for storage of additional information about the artifact */
-	protected static final String DESCRIPTION = "description"; //$NON-NLS-1$
-
-	public static final int NONE = 0;
-
-	public static final int FUNCTION_CALL = 1;
-
-	public static final int CONSTANT = 2;
-
-	/** types of constructs, for the default case */
-	public static   String[] CONSTRUCT_TYPE_NAMES = { Messages.SimpleTableMarkerView_none,
-			Messages.SimpleTableMarkerView_function_call, Messages.SimpleTableMarkerView_constant };
-
-	/**
-	 * Simple Artifact Table View constructor
-	 * <p>
-	 * Everything can be null, and defaults will be taken, or read from
-	 * plugin.xml for the view.
-	 * <p>
-	 * Note: if a null plugIn instance is provided, the default plugin (this
-	 * one) will not be able to find resources (e.g. icon images) if the derived
-	 * class is in its own plug-in, and its icons are, too.
-	 */
-	public SimpleTableMarkerView(AbstractUIPlugin thePlugin, String thingname,
-			String thingnames, String columnName, String[] markerIDs) {
-
-		if (thePlugin == null) {
-			thePlugin_ = CommonPlugin.getDefault();
-		} else {
-			this.thePlugin_ = thePlugin;
-		}
-		if (thingname != null)
-			this.thingname_ = thingname;
-		if (thingnames != null)
-			this.thingnames_ = thingnames;
-		if (columnName != null) {
-			this.columnName_ = columnName; // last column named by subclass
-		}
-		this.markerIDs_ = markerIDs;// if null, will use view id.
-
-		findViewInfo();
-
-	}
-	public SimpleTableMarkerView(AbstractUIPlugin thePlugin, String thingname,
-			String thingnames, String columnName, String markerID) {
-		this(thePlugin, thingname, thingnames, columnName, new String[]{markerID});
-		
-	
-	}
-
-	/**
-	 * Simple table view with an arbitrary number of extra columns
-	 * 
-	 * @param thePlugin
-	 * @param thingname
-	 * @param thingnames
-	 * @param attrNames
-	 *            list of marker attributes, for which the column values will be
-	 *            extractd
-	 * @param colNames
-	 *            list of Column names, used as headers for the values found in
-	 *            the marker attributes
-	 * @param markerID_
-	 */
-	public SimpleTableMarkerView(AbstractUIPlugin thePlugin, String thingname,
-			String thingnames, String[] attrNames, String[] colNames,
-			String[] markerIDs) {
-		this(thePlugin, thingname, thingnames, null, markerIDs);
-		columnNames_ = colNames;
-		columnName_ = null;// set this so we can tell we are using array of
-							// attrs/cols
-		markerAttrNames_ = attrNames;
-
-	}
-
-	/**
-	 * Ctor that uses defaults for everything (testing? theoretically, this
-	 * should work, and should be reusable since info that must be unique is
-	 * read from from plugin.xml.)
-	 * 
-	 */
-//	public SimpleTableMarkerView() {
-//		this(null, null, null, null, null);
-//	}
-
-	/**
-	 * Find info from the view info in the manifest. This includes the icon
-	 * name, the view id (used as marker id if none given on ctor), and
-	 * constructs an artifact manager for this view's artifact objects
-	 * 
-	 */
-	protected void findViewInfo() {
-		String classname = this.getClass().getName();
-		// try to find the icon specified in the plugin.xml for this
-		// extension/view
-		IExtension[] ext = Platform.getExtensionRegistry().getExtensionPoint(
-				"org.eclipse.ui.views").getExtensions(); //$NON-NLS-1$
-		for (int i = 0; i < ext.length; i++) {
-			IExtension extension = ext[i];
-			IConfigurationElement[] ces = extension.getConfigurationElements();
-			for (int j = 0; j < ces.length; j++) {
-				IConfigurationElement cElement = ces[j];
-				String iconName = cElement.getAttribute("icon"); //$NON-NLS-1$
-				String classN = cElement.getAttribute("class"); //$NON-NLS-1$
-				String name = cElement.getAttribute("name"); //$NON-NLS-1$
-				if (classname.equals(classN)) {
-					if (iconName != null) {
-						iconName_ = iconName;
-					}
-					this.viewName_ = name;
-					if (markerIDs_ == null) {
-						// use plug-in id for marker id, if not specified
-						markerIDs_ = new String[1];
-						String pluginID=cElement.getAttribute("id"); //$NON-NLS-1$
-						markerIDs_[1]=pluginID;
-					}
-				}
-
-			}
-
-		}
-	}
-
-	/**
-	 * It might be useful for subclasses to override this, to say which
-	 * filenames should allow the action "run analysis" to create new artifacts
-	 * and thus new markers. <br>
-	 * This is a default implementation
-	 * 
-	 * @param filename
-	 * @return
-	 */
-	public boolean validForAnalysis(String filename) {
-		// return MpiUtil.validForAnalysis(filename);
-		return true;
-
-	}
-
-	/**
-	 * The content provider class is responsible for providing objects to the
-	 * view. It can wrap existing objects in adapters or simply return objects
-	 * as-is. These objects may be sensitive to the current input of the view,
-	 * or ignore it and always show the same content (like Task List, for
-	 * example).
-	 */
-	class ViewContentProvider implements IStructuredContentProvider,
-			IResourceChangeListener {
-		private IResource input;
-
-		private boolean hasRegistered = false;
-
-		public void inputChanged(Viewer v, Object oldInput, Object newInput) {
-			// could use this to change the list to just artifacts from one
-			// resource,
-			// etc...
-			// could cache viewer here this.viewer=v;
-			if (traceOn)
-				System.out.println("ATV inputChanged()..."); //$NON-NLS-1$
-			// if this is the first time we have been given an input
-			if (!hasRegistered) {
-				// add me as a resource change listener so i can refresh at
-				// least when markers are changed
-				// POST_CHANGE: only want event notifications for after-the-fact
-				ResourcesPlugin.getWorkspace().addResourceChangeListener(this,
-						IResourceChangeEvent.POST_CHANGE);
-				hasRegistered = true;
-				if (traceOn)
-					System.out
-							.println("ATV: Registered RCL for ViewContentProvider"); //$NON-NLS-1$
-			}
-			if (newInput instanceof IResource) {
-				this.input = (IResource) newInput;
-			}
-
-		}
-
-		public void dispose() {
-			if (traceOn)
-				System.out.println("ATV.ViewContentProvider.dispose()"); //$NON-NLS-1$
-			ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-
-		}
-
-		/**
-		 * Get the list of objects to populate this view.
-		 */
-		public Object[] getElements(Object parent) {
-			Object[] objs = null;
-			List<IMarker>  allObjs=new ArrayList<IMarker>();
-			try {
-				//String id = markerIDs_;
-				if (input == null) {
-					if (traceOn)
-						System.out.println("input is null in getElements..."); //$NON-NLS-1$
-				}
-				// use the cached input object instead of querying from
-				// workspace objs = ResourcesPlugin.getWorkspace().getRoot().findMarkers(id,
-				// false, IResource.DEPTH_INFINITE);
-				for (int i = 0; i < markerIDs_.length; i++) {
-					String id= markerIDs_[i];
-					objs = input.findMarkers(id, false, IResource.DEPTH_INFINITE);
-					List  markList= Arrays.asList(objs);
-					//allObjs.addAll((List<IMarker>) Arrays.asList(objs));
-					if(traceOn)System.out.println("found "+(objs.length)+ " markers of type " //$NON-NLS-1$ //$NON-NLS-2$
-							+id);
-					allObjs.addAll(markList);
-					 
-					//String[] sl = (String[]) list.toArray(new String[0]);
-				}
-				if(traceOn)System.out.println("Found "+allObjs.size()+" total markers"); //$NON-NLS-1$ //$NON-NLS-2$
-				 
-			} catch (CoreException e) {
-				System.out
-						.println("ATV, exception getting model elements (markers for Table view)"); //$NON-NLS-1$
-				e.printStackTrace();
-			}
-			if (traceOn)
-				System.out.println("ATV.get---Elements, found " + objs.length //$NON-NLS-1$
-						+ " markers"); //$NON-NLS-1$
-			return allObjs.toArray();
-
-		}
-
-		/**
-		 * react to a resource change event
-		 * 
-		 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
-		 */
-
-		public void resourceChanged(IResourceChangeEvent event) {
-			if (traceOn)
-				System.out.println("-----------------resourceChanged()"); //$NON-NLS-1$
-			final IResourceDelta delta = event.getDelta();
-			if (traceOn)
-				printResourcesChanged(delta, 1);
-			// remove the following when resource delta visitor does it all?
-			Control ctrl = viewer.getControl();
-			if (ctrl != null && !ctrl.isDisposed()) {
-				ctrl.getDisplay().syncExec(new Runnable() {
-					public void run() {
-						try {
-							if (traceOn)
-								System.out
-										.println("viewer.update ea mkr in delta-- from resourceChanged()..."); //$NON-NLS-1$
-							if (traceOn)
-								System.out
-										.println("----processResourceChangeDelta()..."); //$NON-NLS-1$
-							processResourceChangeDelta(delta);
-							if (traceOn)
-								System.out
-										.println("----END processResourceChangeDelta()..."); //$NON-NLS-1$
-							if (traceOn)
-								System.out.println("viewer.refresh()"); //$NON-NLS-1$
-							// we should have updated the indiv. rows we care
-							// about,
-							// but need this for Marker display after initial
-							// analysis,
-							// and for markers deleted, etc. Can remove when we
-							// more completely
-							// handle things in processResourceChangeDelta
-							// (removes etc.)
-							viewer.refresh();
-
-						} catch (Exception e) {
-							System.out
-									.println("ATV: Exception refreshing viewer: " //$NON-NLS-1$
-											+ e);
-							e.printStackTrace();
-						}
-
-					}
-				});
-			}
-			if (traceOn)
-				System.out.println("-----------------END resourceChanged()\n"); //$NON-NLS-1$
-
-		}
-
-		/**
-		 * Debugging statement help - prints the events, indented by nesting
-		 * level
-		 * 
-		 * @param delta
-		 * @param indent
-		 */
-		private void printResourcesChanged(IResourceDelta delta, int indent) {
-			printOneResourceChanged(delta, indent);
-			IResourceDelta[] children = delta.getAffectedChildren();
-			for (int i = 0; i < children.length; i++)
-				printResourcesChanged(children[i], indent + 1);
-		}
-
-		/**
-		 * Some debugging statement help
-		 * 
-		 * @param delta
-		 * @param indent number of levels of indent we should consider ourselves as being in
-		 */
-		private void printOneResourceChanged(IResourceDelta delta, int indent) {
-			StringBuffer buf = new StringBuffer(80);
-			for (int i = 0; i < indent; i++)
-				buf.append("  "); //$NON-NLS-1$
-			switch (delta.getKind()) {
-			case IResourceDelta.ADDED:
-				buf.append("ADDED"); //$NON-NLS-1$
-				break;
-			case IResourceDelta.REMOVED:
-				buf.append("REMOVED"); //$NON-NLS-1$
-				break;
-			case IResourceDelta.CHANGED:
-				buf.append("CHANGED"); //$NON-NLS-1$
-				testDelta(delta);
-				break;
-			default:
-				buf.append("["); //$NON-NLS-1$
-				buf.append(delta.getKind());
-				buf.append("]"); //$NON-NLS-1$
-				break;
-			}
-			buf.append(" "); //$NON-NLS-1$
-			buf.append(delta.getResource());
-			System.out.println(buf);
-		}
-
-		/**
-		 * Show debugging info for a resource delta change
-		 * 
-		 * @param delta
-		 */
-		private void testDelta(IResourceDelta delta) {
-			// -- code from eclipse help:
-			// case IResourceDelta.CHANGED:
-			System.out.print("Resource "); //$NON-NLS-1$
-			System.out.print(delta.getFullPath());
-			System.out.println(" has changed."); //$NON-NLS-1$
-			int flags = delta.getFlags();
-			if ((flags & IResourceDelta.CONTENT) != 0) {
-				System.out.println("--> Content Change"); //$NON-NLS-1$
-			}
-			if ((flags & IResourceDelta.REPLACED) != 0) {
-				System.out.println("--> Content Replaced"); //$NON-NLS-1$
-			}
-			if ((flags & IResourceDelta.MARKERS) != 0) {
-				System.out.println("--> Marker Change"); //$NON-NLS-1$
-				// IMarkerDelta[] markers = delta.getMarkerDeltas();
-				// if interested in markers, check these deltas
-			}
-		}
-
-		/**
-		 * Process the resource change - just the delta
-		 * 
-		 * @param delta
-		 */
-		protected void processResourceChangeDelta(IResourceDelta delta) {
-			try {
-				delta.accept(visitor_);
-
-			} catch (CoreException e2) {
-				System.out
-						.println("Error in PITV.processResourceChangeDelta().."); //$NON-NLS-1$
-				e2.printStackTrace();
-			}
-		}
-
-	} // end ViewContentProvider
-
-	/**
-	 * get artifact from marker
-	 * 
-	 * @param marker
-	 * @return
-	 */
-	protected IArtifact getSimpleArtifact(IMarker marker) {
-		String id = null;
-		IArtifact artifact = null;
-		try {
-			id = (String) marker.getAttribute(uniqueID_);
-			artifact =ArtifactManager.getArtifact(marker);
-		} catch (CoreException e) {
-			// e.printStackTrace();
-			System.out.println(e.getMessage()
-					+ " ... STV, CoreException getting artifact from hashMap; " //$NON-NLS-1$
-					+ thingname_ + " id=" + id); //$NON-NLS-1$
-		} catch (NullPointerException ne) {
-			System.out.println(ne.getMessage()
-					+ " ... STV, NullPtrExcp getting artifact from hashMap;" //$NON-NLS-1$
-					+ thingname_ + " id=" + id); //$NON-NLS-1$
-		}
-		return artifact;
-
-	}
-
-	/**
-	 * Get string representing the type of construct
-	 * 
-	 * @param marker
-	 * @return
-	 * @throws CoreException
-	 */
-	protected String getConstructStr(IMarker marker) throws CoreException {
-		Integer temp = (Integer) marker.getAttribute(columnID_);
-		if (temp != null) {
-			Integer constructType = (Integer) temp;
-			return CONSTRUCT_TYPE_NAMES[constructType.intValue()];
-		} else
-			return " "; //$NON-NLS-1$
-	}
-
-	/**
-	 * 
-	 * ViewLabelProvider - provides the text and images for the artifacts in the
-	 * Table View
-	 * 
-	 * @author Beth Tibbitts
-	 * 
-	 * 
-	 */
-	class ViewLabelProvider extends LabelProvider implements
-			ITableLabelProvider {
-		/**
-		 * Keep icons already created, and reuse the images
-		 */
-		private HashMap<String, Image> iconHash = new HashMap<String, Image>();
-
-		private IArtifact artifact;
-
-		/**
-		 * provide what goes in each column; get the info from the marker
-		 */
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-		 */
-		public String getText(Object o) {
-			String temp = super.getText(o);
-			// System.out.println("Text: " + temp);
-			return temp;
-		}
-
-		/**
-		 * Determine the text to go in each column
-		 * 
-		 * @param obj
-		 *            the Marker (we hope) that goes on the current row
-		 * @param index
-		 *            the column number in the table
-		 * 
-		 */
-		public String getColumnText(Object obj, int index) {
-			if (obj == null) {
-				System.out
-						.println("ATV: LabelProv obj is null; index=" + index); //$NON-NLS-1$
-				return "ATV obj null"; //$NON-NLS-1$
-			}
-			IMarker marker = (IMarker) obj;
-			try {
-				switch (index) {
-				case 0:
-					return ""; //$NON-NLS-1$
-				case 1:
-					String id = (String) marker.getAttribute(NAME);
-					return id;
-				case 2:
-
-					return (String) marker.getAttribute(FILENAME);
-				case 3:
-					String line = (marker.getAttribute(IMarker.LINE_NUMBER))
-							.toString();
-
-					if (traceOn) { // all this is for debugging purposes so
-						artifact = getSimpleArtifact(marker);
-						String compLine = line + "-"; //$NON-NLS-1$
-						if (artifact == null) {
-							if (traceOn)
-								System.out
-										.println("ATV getColumnText- null artifact"); //$NON-NLS-1$
-						} else {
-							int lineArtifact = artifact.getLine();
-							compLine = compLine + lineArtifact;
-						}
-						System.out
-								.println("ATV.ViewLabelProvider gets marker line: mkr-artifact: " //$NON-NLS-1$
-										+ compLine);
-						showMarker(marker);
-					}
-					return line;
-				case 4:
-					if (columnName_ != null) {// we're not using array
-						return getConstructStr(marker);
-					}
-				// else drop through...
-
-				default:
-					String attrName = markerAttrNames_[index - 4];
-					String val = marker.getAttribute(attrName, ""); //$NON-NLS-1$
-					return val;
-				}
-			} catch (CoreException ce) {
-				// get this error 3x "Marker id: 999 not found." while deleting
-				// markers. why?
-				// Why is this even getting called, and why does it matter?
-				// String tmp = ce.getMessage();
-				// ce.printStackTrace();
-				return ("ATV error"); //$NON-NLS-1$
-			}
-		}
-
-		/**
-		 * Provide the image that goes in a column, if any (Note that a table
-		 * cell can contain both, an image and text, which will be displayed
-		 * side-by-side)
-		 * 
-		 * @param obj -
-		 *            the object we're getting the image for
-		 * @param index -
-		 *            the column that this image is to go in
-		 */
-		public Image getColumnImage(Object obj, int index) {
-			// we only put image icon in the first column
-			switch (index) {
-			case 0:
-				return getCustomImage(obj);
-			default:
-				return null;
-			}
-		}
-
-		/**
-		 * Get image for artifact. Note that different images could be used for
-		 * different types of artifacts. For now we have a single image.
-		 * 
-		 * @param obj
-		 *            the marker object that this artifact is represented by
-		 * @return image for marker
-		 *         <p>
-		 *         Note: if a null plugIn instance is provided on the view ctor,
-		 *         the default plugin (this one) will not be able to find
-		 *         resources (e.g. icon images) if the derived class is in its
-		 *         own plug-in, and its icons are, too.
-		 * 
-		 */
-		protected Image getCustomImage(Object obj) {
-			// if we've already created one of this type of icon, reuse it.
-			// Note: use ImageRegistry instead?
-			Image img = iconHash.get(iconName_);
-			if (img == null) {
-				Path path = new Path(iconName_);
-				// BRT make sure the specific plugin is being used here to find
-				// its OWN icons
-				URL url = FileLocator.find(thePlugin_.getBundle(), path, null);
-				ImageDescriptor id = ImageDescriptor.createFromURL(url);
-				img = id.createImage();
-				if (traceOn)
-					System.out.println("ATV: ***** created image for " //$NON-NLS-1$
-							+ iconName_);
-				iconHash.put(iconName_, img);// save for reuse
-			}
-			return img;
-		}
-
-		/**
-		 * Dispose of anything that would hang around rudely otherwise (such as
-		 * image objects from the icons)
-		 * 
-		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-		 */
-
-		public void dispose() {
-			if (traceOn)
-				System.out
-						.println("ATV.ViewLabelProvider.dispose(); dispose of icon images"); //$NON-NLS-1$
-			for (Iterator<Image> iter = iconHash.values().iterator(); iter.hasNext();) {
-				Image img = iter.next();
-				img.dispose();
-			}
-			super.dispose();
-		}
-
-	}
-
-	/**
-	 * Default sorter for items - the order they were created, which tends to
-	 * group items with their source code locations
-	 * 
-	 * @author Beth Tibbitts
-	 */
-	class NameSorter extends ViewerSorter {
-	}
-
-	/**
-	 * Sort items by one or more of: artifact, filename, lineNo,
-	 * variableColumnName.<br>
-	 * The derived classes will implement combine() to say how the attributes
-	 * are combined to get the sort desired.
-	 * 
-	 * @author Beth Tibbitts
-	 */
-	abstract class GenericSorter extends ViewerSorter {
-		protected boolean ascending = true;
-
-		/**
-		 * Compare two items to determine sort order. Sort items by one or more
-		 * of: artifact name, then file, then line number, then construct
-		 */
-		public int compare(Viewer viewer, Object e1, Object e2) {
-			int result = 0;
-
-			int cat1 = category(e1);
-			int cat2 = category(e2);
-
-			if (cat1 != cat2)
-				return cat1 - cat2;
-
-			java.text.Collator collator = this.getCollator();
-
-			if (e1 instanceof IMarker) {
-				try {
-					IMarker m1 = (IMarker) e1;
-					IMarker m2 = (IMarker) e2;
-					String name1 = (String) m1.getAttribute(NAME);
-					String file1 = (String) m1.getAttribute(FILENAME);
-
-					String line1 = (String) m1.getAttribute(LINE).toString();
-					String construct1 = getConstructStr(m1);
-					String sort1 = combine(name1, file1, line1, construct1);
-
-					String name2 = (String) m2.getAttribute(NAME);
-					String file2 = (String) m2.getAttribute(FILENAME);
-					String line2 = (String) m2.getAttribute(LINE).toString();
-					String construct2 = getConstructStr(m2);
-					String sort2 = combine(name2, file2, line2, construct2);
-
-					if (ascending)
-						result = collator.compare(sort1, sort2);
-					else
-						result = collator.compare(sort2, sort1);
-
-					return result;
-				} catch (CoreException e) {
-					e.printStackTrace();
-				}
-			}
-			return 0;
-
-		}
-
-		/**
-		 * Combine name, file, and/or line number to provide the string to sort
-		 * by. Will be overridden by derived classes as needed
-		 * 
-		 * @param name
-		 * @param file
-		 * @param line
-		 * @param construct
-		 * @return always return null, subclass can choose to impl. this method.
-		 */
-		protected String combine(String name, String file, String line,
-				String construct) {
-			return null;
-		}
-
-		/**
-		 * switch to this sorter. If it was already this sorter, then toggle the
-		 * sort order
-		 * 
-		 */
-		public void sort() {
-			// String className = this.getClass().getName();
-			// System.out.println(className+".sort() ascending="+ascending);
-			if (this == viewer.getSorter()) {
-				ascending = !ascending;
-				viewer.setSorter(null); // turn off to force re-sort
-			} else {
-				ascending = true;
-			}
-			viewer.setSorter(this);
-
-		}
-
-	}
-
-	/**
-	 * Sorter to sort by line number on which the SimpleArtifact is Found
-	 * 
-	 * @author Beth Tibbitts created
-	 * 
-	 * 
-	 */
-	class LineNoSorter extends GenericSorter {
-		/**
-		 * sort items by line number
-		 */
-		public int compare(Viewer viewer, Object e1, Object e2) {
-
-			int cat1 = category(e1);
-			int cat2 = category(e2);
-
-			if (cat1 != cat2)
-				return cat1 - cat2;
-
-			if (e1 instanceof IMarker) {
-				try {
-					IMarker m1 = (IMarker) e1;
-					Object tempObj = m1.getAttribute(LINE);
-					int line1=0;
-					int line2=0;
-					if (tempObj instanceof Integer) {
-						line1 = ((Integer)tempObj).intValue();
-						IMarker m2 = (IMarker) e2;
-						tempObj= m2.getAttribute(LINE);
-						// we assume if the first was Integer, this one is, too.
-						assert tempObj instanceof Integer;
-						line2 = ((Integer)tempObj).intValue();
-
-					}
-					int result = 0;
-					if (ascending)
-						result = line1 - line2;
-					else
-						result = line2 - line1;
-
-					return result;
-				} catch (CoreException e) {
-					e.printStackTrace();
-				}
-			}
-			return 0;
-
-		}
-	}
-
-	/**
-	 * Sort items by name
-	 * 
-	 * @author Beth Tibbitts
-	 * 
-	 * 
-	 */
-	class NameArtifactSorter extends GenericSorter {
-
-		/**
-		 * @param name
-		 * @param file
-		 * @param line
-		 * @param construct
-		 * @return BRT note: Sort isn't quite right: if name,filename identical,
-		 *         "10" would sort before "2" e.g.
-		 */
-		protected String combine(String name, String file, String line,
-				String construct) {
-			final String delim = " - "; //$NON-NLS-1$
-			StringBuffer result = new StringBuffer(name);
-			result.append(delim);
-			result.append(file);
-			result.append(delim);
-			result.append(line);
-			result.append(delim);
-			result.append(construct);
-			return result.toString();
-		}
-	}
-
-	/**
-	 * Sort items by filename (then line number)
-	 * 
-	 * @author Beth Tibbitts
-	 * 
-	 * 
-	 */
-	class FilenameSorter extends GenericSorter {
-		public int compare(Viewer viewer, Object e1, Object e2) {
-
-			int cat1 = category(e1);
-			int cat2 = category(e2);
-
-			if (cat1 != cat2)
-				return cat1 - cat2;
-			int res = 0;
-			try {
-				IMarker m1 = (IMarker) e1;
-				IMarker m2 = (IMarker) e2;
-				String file1 = (String) m1.getAttribute(FILENAME);
-				String file2 = (String) m2.getAttribute(FILENAME);
-				if(traceOn)System.out.println("ascending=" + ascending); //$NON-NLS-1$
-				if (ascending)
-					res = collator.compare(file1, file2);
-				else
-					res = collator.compare(file2, file1);
-				// if the filename is the same, only then do we look at line
-				// number
-				if (res == 0) {
-					String line1 = m1.getAttribute(LINE).toString();
-					String line2 = m2.getAttribute(LINE).toString();
-					int l1 = Integer.parseInt(line1);
-					int l2 = Integer.parseInt(line2);
-					if (ascending)
-						res = l1 - l2;
-					else
-						res = l2 - l1;
-				}
-				// if the filename and line no are the same, only then do we
-				// look at construct
-				if (res == 0) {
-					if (ascending) {
-						res = collator.compare(getConstructStr(m1),
-								getConstructStr(m2));
-					} else {
-						res = collator.compare(getConstructStr(m2),
-								getConstructStr(m1));
-					}
-				}
-			} catch (CoreException e) {
-				e.printStackTrace();
-			}
-			return res;
-		}
-	}
-
-	class ConstructSorter extends GenericSorter {
-
-		/**
-		 * @param name
-		 * @param file
-		 * @param line
-		 * @param construct
-		 * @return BRT note: Sort isn't quite right: if name,filename identical,
-		 *         "10" would sort before "2" e.g.
-		 */
-		protected String combine(String name, String file, String line,
-				String construct) {
-			final String delim = " - "; //$NON-NLS-1$
-			StringBuffer result = new StringBuffer(construct);
-			result.append(delim);
-			result.append(name);
-			result.append(delim);
-			result.append(file);
-			result.append(delim);
-			result.append(line);
-			return result.toString();
-		}
-	}
-
-	/**
-	 * This is a callback that will allow us to create the viewer and initialize
-	 * it.
-	 */
-	public void createPartControl(Composite parent) {
-		// Widget created and customized and then passed to viewer during
-		// creation :
-		Table table = new Table(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI
-				| SWT.FULL_SELECTION);
-		TableLayout layout = new TableLayout();
-		table.setLayout(layout);
-		table.setLinesVisible(true);
-		table.setHeaderVisible(true);
-		String[] STD_HEADINGS = { " ", thingname_, Messages.SimpleTableMarkerView_filename, Messages.SimpleTableMarkerView_lineno, //$NON-NLS-1$
-				this.columnName_ };
-
-		layout.addColumnData(new ColumnWeightData(1, 1, true));
-		TableColumn tc0 = new TableColumn(table, SWT.NONE);
-		tc0.setText(STD_HEADINGS[0]);
-		tc0.setAlignment(SWT.LEFT);
-		tc0.setResizable(true);
-
-		layout.addColumnData(new ColumnWeightData(10, true));
-		TableColumn tc1 = new TableColumn(table, SWT.NONE);
-		tc1.setText(STD_HEADINGS[1]);
-		tc1.setAlignment(SWT.LEFT);
-		tc1.setResizable(true);
-
-		layout.addColumnData(new ColumnWeightData(10, true));
-		TableColumn tc2 = new TableColumn(table, SWT.NONE);
-		tc2.setText(STD_HEADINGS[2]);
-		tc2.setAlignment(SWT.LEFT);
-		tc2.setResizable(true);
-
-		layout.addColumnData(new ColumnWeightData(5, true));
-		TableColumn tc3 = new TableColumn(table, SWT.NONE);
-		tc3.setText(STD_HEADINGS[3]);
-		tc3.setAlignment(SWT.LEFT);
-		tc3.setResizable(true);
-
-		TableColumn tc4 = null;
-		if (this.columnName_ != null) {
-			layout.addColumnData(new ColumnWeightData(5, true));
-			tc4 = new TableColumn(table, SWT.NONE);
-			tc4.setText(STD_HEADINGS[4]);
-			tc4.setAlignment(SWT.LEFT);
-			tc4.setResizable(true);
-		} else {
-			int numCols = columnNames_.length;
-			TableColumn[] tableCols = new TableColumn[numCols];
-			for (int i = 0; i < numCols; i++) {
-				layout.addColumnData(new ColumnWeightData(5, true));
-				TableColumn tc = new TableColumn(table, SWT.NONE);
-				tc.setText(columnNames_[i]);
-				tc.setAlignment(SWT.LEFT);
-				tc.setResizable(true);
-				tableCols[i] = tc;
-			}
-		}
-
-		// add listeners for table sorting
-		// Sort by "icon" (the original sort order, actually)
-		tc0.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent event) {
-				viewer.setSorter(null);
-				viewer.setSorter(nameSorter);
-			}
-
-			public void widgetDefaultSelected(SelectionEvent event) {
-			}
-		});
-		// Sort by artifact name
-		tc1.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent event) {
-				nameArtifactSorter.sort();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent event) {
-			}
-		});
-		// Sort by file name (then by lineNo)
-		tc2.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent event) {
-				filenameSorter.sort();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent event) {
-			}
-		});
-		// Sort by Line number
-		tc3.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent event) {
-				lineNoSorter.sort();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent event) {
-			}
-		});
-		// Sort by Construct (if we're not doing an array of extra columns)
-		if (tc4 != null) {
-			tc4.addSelectionListener(new SelectionListener() {
-				public void widgetSelected(SelectionEvent event) {
-					constructSorter.sort();
-				}
-
-				public void widgetDefaultSelected(SelectionEvent event) {
-				}
-			});
-		}
-
-		// Selection listener to know when a table row is selected.
-
-		table.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// System.out.println("widgetDefaultSelected");
-			}
-
-			public void widgetSelected(SelectionEvent e) {
-				Object obj = e.getSource();
-				if (obj instanceof Table) {
-					Table t = (Table) obj;
-					int row = t.getSelectionIndex();
-					// rowSelected_ = row;
-					// print marker info when selected in table
-					if (traceOn) {
-						TableItem ti = t.getItem(row);
-						IMarker marker = (IMarker) ti.getData();
-						IArtifact artifact = getSimpleArtifact(marker);
-						String id = marker.getAttribute(uniqueID_, Messages.SimpleTableMarkerView_error);
-						int mLine = MarkerUtilities.getLineNumber(marker);
-						int lineNo = 0;
-						if (artifact != null)
-							lineNo = artifact.getLine();
-
-						if (traceOn)
-							System.out.println("MARKER id=" + id //$NON-NLS-1$
-									+ " mkrLineNo=" + mLine //$NON-NLS-1$
-									+ " artifactLineNo=" + lineNo); //$NON-NLS-1$
-					}
-
-				}
-			}
-		});
-
-		viewer = new TableViewer(table);
-		viewer.setContentProvider(new ViewContentProvider());
-		viewer.setLabelProvider(new ViewLabelProvider());
-		// Set up the sorters.
-		nameSorter = new NameSorter();
-		viewer.setSorter(nameSorter);
-		lineNoSorter = new LineNoSorter();
-		nameArtifactSorter = new NameArtifactSorter();
-		filenameSorter = new FilenameSorter();
-		constructSorter = new ConstructSorter();
-
-		viewer.setInput(ResourcesPlugin.getWorkspace().getRoot());
-		// markers from workspace
-
-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection sel = (IStructuredSelection) event
-						.getSelection();
-				Object obj = sel.getFirstElement();
-				if (obj instanceof IMarker) {
-					selectedMarker_ = (IMarker) obj;
-				}
-				showStatusMessage("", "selectionChanged"); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		});
-
-		makeActions();
-		hookContextMenu();
-		hookDoubleClickAction();
-		contributeToActionBars();
-	}
-
-	private void hookContextMenu() {
-		MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager manager) {
-				SimpleTableMarkerView.this.fillContextMenu(manager);
-			}
-		});
-		Menu menu = menuMgr.createContextMenu(viewer.getControl());
-		viewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(menuMgr, viewer);
-	}
-
-	private void contributeToActionBars() {
-		IActionBars bars = getViewSite().getActionBars();
-		fillLocalPullDown(bars.getMenuManager());
-		fillLocalToolBar(bars.getToolBarManager());
-	}
-
-	private void fillLocalPullDown(IMenuManager manager) {
-		manager.add(infoAction);
-		manager.add(new Separator());
-		manager.add(filterAction);
-	}
-
-	private void fillContextMenu(IMenuManager manager) {
-		manager.add(infoAction);
-		// Other plug-ins can contribute their actions here
-		manager.add(new Separator("Additions")); //$NON-NLS-1$
-	}
-
-	private void fillLocalToolBar(IToolBarManager manager) {
-		manager.add(infoAction);
-		manager.add(removeMarkerAction);
-		manager.add(filterAction);
-	}
-
-	/**
-	 * Make the action objects for the menus and toolbar.
-	 * 
-	 */
-	private void makeActions() {
-		makeShowInfoAction();
-		makeRemoveMarkerAction();
-		makeFilterAction();
-		makeDoubleClickAction();
-	}
-
-	/**
-	 * Make "show info" action to display artifact information
-	 */
-	protected void makeShowInfoAction() {
-		infoAction = new Action() {
-			public void run() {
-				String title = thingname_ + Messages.SimpleTableMarkerView_information;
-				if (selectedMarker_ != null) {
-					String idFromMarker = (String) selectedMarker_
-							.getAttribute(uniqueID_, null);
-					if (idFromMarker == null) {
-						System.out.println("ATV: exception reading marker ID"); //$NON-NLS-1$
-						return;
-					}
-					StringBuffer info = new StringBuffer();
-
-					IArtifact artifact=null;;
-					try {
-						artifact = ArtifactManager.getArtifact(selectedMarker_);
-					} catch (CoreException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-					if (artifact != null) {
-						info.append(Messages.SimpleTableMarkerView_filename2).append(artifact.getFileName());
-						info.append(Messages.SimpleTableMarkerView_lineno2).append(artifact.getLine());
-						info.append(Messages.SimpleTableMarkerView_name2).append(artifact.getShortName());
-						String desc=artifact.getDescription();
-						if (desc!=null){
-							info.append(Messages.SimpleTableMarkerView_description2).append(desc);
-						}
-					}
-					else{
-						info.append(Messages.SimpleTableMarkerView_no_info_avail);
-					}
-					MessageDialog.openInformation(null, title, info.toString());
-				}// end if selectedMarker!=null
-				else {
-					MessageDialog.openInformation(null, title, Messages.SimpleTableMarkerView_no
-							+ thingname_ + Messages.SimpleTableMarkerView_selected);
-				}
-			}
-		};
-		infoAction.setText(Messages.SimpleTableMarkerView_showInfo);
-		infoAction.setToolTipText(Messages.SimpleTableMarkerView_showInfoTooltip
-				+ thingname_);
-		infoAction.setImageDescriptor(PlatformUI.getWorkbench()
-				.getSharedImages().getImageDescriptor(
-						ISharedImages.IMG_OBJS_INFO_TSK));
-	}
-
-	/**
-	 * Make "remove marker" action to display artifact information
-	 */
-	protected void makeRemoveMarkerAction() {
-		removeMarkerAction = new Action() {
-			public void run() {
-				// batch changes so we get only one resource change event
-				final IWorkspaceRoot wsResource = ResourcesPlugin.getWorkspace().getRoot();
-				
-				IWorkspaceRunnable runnable = new IWorkspaceRunnable(){
-					public void run(IProgressMonitor monitor) throws CoreException {
-					try {
-						int depth = IResource.DEPTH_INFINITE;
-
-						for (int i = 0; i < markerIDs_.length; i++) {
-							String markerID = markerIDs_[i];
-							wsResource.deleteMarkers(markerID,false,depth);
-						}
-						
-						if(traceOn)System.out.println("markers removed."); //$NON-NLS-1$
-					} catch (CoreException e) {
-						System.out.println("RM: exception deleting markers."); //$NON-NLS-1$
-						// e.printStackTrace();
-					}
-					}};
-					try {
-						runnable.run(null);
-					} catch (CoreException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-
-				 
-			}//end run()
-		};// end new action
-		removeMarkerAction.setText(Messages.SimpleTableMarkerView_removeMarkers);
-		removeMarkerAction.setToolTipText(Messages.SimpleTableMarkerView_removeMarkersTooltip);
-		removeMarkerAction.setImageDescriptor(PlatformUI.getWorkbench()
-				.getSharedImages().getImageDescriptor(
-						ISharedImages.IMG_TOOL_DELETE));// nice "red X" image
-
-	}
-
-	/**
-	 * make filter action, allowing user to customize the information
-	 * shown in the view.
-	 */
-	private void makeFilterAction() {
-		filterAction = new Action() {
-			public void run() {
-				showMessage(Messages.SimpleTableMarkerView_91 + thingnames_ + Messages.SimpleTableMarkerView_92
-						+ thingnames_ + Messages.SimpleTableMarkerView_93);
-			}
-		};
-		filterAction.setText(Messages.SimpleTableMarkerView_94 + thingnames_);
-		filterAction.setToolTipText(Messages.SimpleTableMarkerView_95 + thingnames_
-				+ Messages.SimpleTableMarkerView_96);
-		// from org.eclipse.ui.views plugin
-		Path path=new Path("icons/filter_ps.gif"); //$NON-NLS-1$
-		Bundle b = CommonPlugin.getDefault().getBundle();
-		String temp=b.getSymbolicName();
-		URL url = FileLocator.find(CommonPlugin.getDefault().getBundle(), path, null);
-		ImageDescriptor id = ImageDescriptor.createFromURL(url);
-		 
-		Image img = id.createImage();
-		
-		filterAction.setImageDescriptor(id);
-	}
-
-	/**
-	 * Make double-click action, which moves editor to the artifact instance in
-	 * the source code (editor to line in source code)
-	 * 
-	 */
-	private void makeDoubleClickAction() {
-
-		doubleClickAction = new Action() {
-			public void run() {
-				ISelection selection = viewer.getSelection();
-				Object obj = ((IStructuredSelection) selection)
-						.getFirstElement();
-				IMarker marker = (IMarker) obj;
-				try {
-					IFile f = (IFile) marker.getResource();
-					int lineNo = getMarkerLineNo(marker);
-					if (f != null && f.exists()) {
-						IWorkbenchPage wbp = getSite().getPage();
-						// IEditorInput ieu = new FileEditorInput(f);
-						IEditorPart editor = IDE.openEditor(wbp, f);
-
-						if (traceOn)
-							System.out.println("dca: marker lineNo before " //$NON-NLS-1$
-									+ MarkerUtilities.getLineNumber(marker));
-						// note: (re?) setting linenumber here is required to
-						// put marker in editor!?!
-						MarkerUtilities.setLineNumber(marker, lineNo);
-						if (traceOn)
-							System.out.println("dca: marker lineNo after " //$NON-NLS-1$
-									+ MarkerUtilities.getLineNumber(marker));
-						IDE.gotoMarker(editor, marker);
-						if (traceOn)
-							System.out
-									.println("ATV: DoubleClickAction, clear status"); //$NON-NLS-1$
-						showStatusMessage("", "double click action"); //$NON-NLS-1$ //$NON-NLS-2$
-					}
-				} catch (Exception e) {
-					System.out
-							.println("ATV.doubleclickAction: Error positioning editor page from marker line number"); //$NON-NLS-1$
-					showStatusMessage(
-							"Error positioning editor from marker line number", //$NON-NLS-1$
-							"error marker goto"); //$NON-NLS-1$
-					e.printStackTrace();
-				}
-			}
-		};
-	}
-
-	private void hookDoubleClickAction() {
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				doubleClickAction.run();
-			}
-		});
-	}
-
-	private void showMessage(String message) {
-		MessageDialog.openInformation(viewer.getControl().getShell(),
-				viewName_, message);
-	}
-
-	private void showStatusMessage(String message, String debugMessage) {
-		if (traceStatusLine) {
-			message += " - "; //$NON-NLS-1$
-			message += debugMessage;
-		}
-		getViewSite().getActionBars().getStatusLineManager()
-				.setMessage(message);
-		getViewSite().getActionBars().getStatusLineManager().update(true);
-
-	}
-
-	/**
-	 * Passing the focus request to the viewer's control.
-	 */
-	public void setFocus() {
-		showStatusMessage("", "setFocus"); // reset status message //$NON-NLS-1$ //$NON-NLS-2$
-		if (!viewer.getControl().isDisposed())
-			viewer.getControl().setFocus();
-	}
-
-	public void dispose() {
-		if (traceOn)
-			System.out.println("SimpleTableView.dispose()"); //$NON-NLS-1$
-		// BRT do we need to dispose of imageDescriptors we made? or just
-		// images?
-
-	}
-
-	public void showMarker(IMarker marker) {
-		System.out.println("Marker-------  IMarker.LINE_NUMBER=" //$NON-NLS-1$
-				+ IMarker.LINE_NUMBER);
-		try {
-			Map attrs = marker.getAttributes();
-			Iterator iter = attrs.entrySet().iterator();
-			while (iter.hasNext()) {
-				Map.Entry e = (Map.Entry) iter.next();
-				System.out.println("   " + e.getKey() + " " + e.getValue()); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-
-		} catch (CoreException e) {
-			e.printStackTrace();
-		}
-
-	}
-
-	public ImageDescriptor makeImageDescriptor(String iconName) {
-		URL url=FileLocator.find(thePlugin_.getBundle(), new Path(iconName), null);
-		ImageDescriptor id = ImageDescriptor.createFromURL(url);
-		return id;
-	}
-
-	/**
-	 * Push change info (artifact and marker) onto a stack so we can remember
-	 * it, for possible undo action. Also enables/disables the Undo action
-	 * button.
-	 * 
-	 * @param artifact
-	 * @param marker
-	 */
-	protected void pushChangedInfo(IArtifact artifact, IMarker marker) {
-		changedArts_.push(artifact);
-		changedMarkers_.push(marker);
-		checkUndoStatus();
-	}
-
-	/**
-	 * Set status of undo action (enabled or disabled) based on if there are any
-	 * artifact changes, or other changes, available to undo
-	 * 
-	 */
-	protected void checkUndoStatus() {
-
-	}
-
-	/**
-	 * Get marker line numbers.
-	 * 
-	 * @param marker
-	 * @return
-	 */
-	protected int getMarkerLineNo(IMarker marker) {
-		int lineNo = getIntAttr(marker, IMarker.LINE_NUMBER);
-		return lineNo;
-	}
-
-	/**
-	 * Get an int value that is assumed to be stored in a marker in a given
-	 * attribute.
-	 * 
-	 * @param marker
-	 * @param attr
-	 *            the attribute name
-	 * 
-	 * @return the int value, or 0 if none found, or invalid value found
-	 */
-	protected int getIntAttr(IMarker marker, String attr) {
-		String temp = null;
-		try {
-			temp = marker.getAttribute(attr).toString();
-		} catch (Exception e) { // CoreException or ClassCastException possible
-			e.printStackTrace();
-			System.out.println("ATV: Marker lineNo(" + attr //$NON-NLS-1$
-					+ ") invalid; using 0"); //$NON-NLS-1$
-			return 0;
-		}
-		int lineNo = 0;
-		try {
-			lineNo = Integer.parseInt(temp);
-		} catch (NumberFormatException nfe) {
-			System.out.println("ATV: Marker lineNo(" + temp + " from attr " //$NON-NLS-1$ //$NON-NLS-2$
-					+ attr + ") invalid (NumberFormatException); using 0"); //$NON-NLS-1$
-		}
-		return lineNo;
-	}
-
-	/**
-	 * convenience method for getting attribute String value.
-	 * 
-	 * @param marker
-	 * @param attr
-	 * @return
-	 */
-	protected String getAttribute(IMarker marker, String attr) {
-		String result = null;
-		try {
-			result = (String) marker.getAttribute(attr);
-		} catch (Exception e) {
-			System.out.println("** Exception getting marker attribute " + e); //$NON-NLS-1$
-			e.printStackTrace();
-		}
-		return result;
-
-	}
-
-	/**
-	 * a Stack that isn't based on Vector - Generic LIFO stack
-	 * 
-	 * @author Beth Tibbitts
-	 * 
-	 * 
-	 */
-	public class StackList {
-		private LinkedList<Object> list = new LinkedList<Object>();
-
-		public void push(Object v) {
-			list.addFirst(v);
-		}
-
-		public Object top() {
-			return list.getFirst();
-		}
-
-		public Object pop() {
-			return list.removeFirst();
-		}
-
-		public boolean isEmpty() {
-			return list.isEmpty();
-		}
-
-	}
-
-	/**
-	 * Visit the resource delta to look for the marker changes we are interested
-	 * in
-	 * 
-	 * @author Beth Tibbitts
-	 */
-	public class UpdateVisitor implements IResourceDeltaVisitor {
-
-		/**
-		 * Visit appropriate parts of the resource delta to find the markers
-		 * that changed that we care about.
-		 * 
-		 * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
-		 */
-		public boolean visit(IResourceDelta delta) throws CoreException {
-			IResource resource = delta.getResource();
-			String name = resource.getName();
-			if (resource.getType() == IResource.FILE) {
-				if (delta.getKind() == IResourceDelta.CHANGED) {
-					if (traceOn)
-						System.out.println("UpdateVisitor: file changed: " //$NON-NLS-1$
-								+ name);
-
-					// Handle file changes (saves) by reporting the changes
-					// made to the file, to update backend analysis
-					// representation
-					IFile f = (IFile) resource;
-					int flags = delta.getFlags();
-					int contentChanged = flags & IResourceDelta.CONTENT;
-
-					if (validForAnalysis(f.getName())) {
-						if (traceOn)
-							System.out
-									.println("File " //$NON-NLS-1$
-											+ f.getName()
-											+ " is valid for analysis so will process the change..."); //$NON-NLS-1$
-						if (contentChanged != 0) {
-							// do we need to tell back end (analysis engine)
-							// that file changed?
-						}
-
-						// refresh markers for that file?
-						IMarkerDelta[] mDeltas = delta.getMarkerDeltas();
-						int len = mDeltas.length;
-						for (int j = 0; j < len; j++) {
-							IMarkerDelta delta3 = mDeltas[j];
-							if (traceOn)
-								showMarkerDeltaKind(delta3);
-							IMarker m = delta3.getMarker();
-							String ln = IMarker.LINE_NUMBER;
-							if (traceOn)
-								System.out
-										.println("---UpdateVisitor.visit():viewer update marker: (lineNo)"); //$NON-NLS-1$
-							// showMarker(m);
-							String[] props = new String[1]; // awkward. why???
-							props[0] = ln;
-							// just update viewer item, not the whole view
-							// viewer.refresh();
-							viewer.update(m, props);
-						} // end loop
-					} else {
-						if (traceOn)
-							System.out
-									.println("File " //$NON-NLS-1$
-											+ f.getName()
-											+ " is NOT valid for analysis so will ignore change..."); //$NON-NLS-1$
-
-					}
-				} // end if CHANGED
-				else if (delta.getKind() == IResourceDelta.ADDED) {
-					//System.out.println("Resource added.");
-					checkMarkerDeltas(delta);
-				} else if (delta.getKind() == IResourceDelta.REPLACED) {
-					//System.out.println("Resource replaced.");
-					checkMarkerDeltas(delta);
-				} else if (delta.getKind() == IResourceDelta.REMOVED) {
-					//System.out.println("Resource removed.");
-					checkMarkerDeltas(delta);
-				}
-			} // end if FILE
-			return true; // keep going
-		}
-
-		private void checkMarkerDeltas(IResourceDelta delta) {
-			IMarkerDelta[] md1 = delta.getMarkerDeltas();
-			int len = md1.length;
-			//System.out.println("       ... found " + len + " markerDeltas.");
-		}
-
-		/**
-		 * Show info about the marker in the marker delta. This is just tracing
-		 * the info available until we do something with it. For now, we're just
-		 * doing a (big) viewer.refresh() to refresh all the markers. When we
-		 * get more intelligent about just updating the ones that changed, we
-		 * can remove that. Shouldn't make much different for small sets of
-		 * markers, but for many markers, this could be a significant
-		 * performance improvement.
-		 * 
-		 * @param delta3
-		 */
-		private void showMarkerDeltaKind(IMarkerDelta delta3) {
-
-			// int mdKind = delta3.getKind();
-			IMarker m = delta3.getMarker();
-
-			String kind = "UNKNOWN"; //$NON-NLS-1$
-			switch (delta3.getKind()) {
-			case IResourceDelta.ADDED:
-				kind = "ADDED"; //$NON-NLS-1$
-				break;
-			case IResourceDelta.CHANGED:
-				kind = "CHANGED"; //$NON-NLS-1$
-				break;
-			case IResourceDelta.REMOVED:
-				kind = "REMOVED"; //$NON-NLS-1$
-				break;
-			default:
-				kind = "UNKNOWN"; //$NON-NLS-1$
-				break;
-			}
-
-			if (traceOn)
-				System.out.println("    markerDeltaKind=" + kind); //$NON-NLS-1$
-			String mid = "", ml = "", mlpi = ""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			try {
-				// note: we're getting marker deltas on ALL markers,
-				// not just artifact markers, which can throw us off.
-				// in particular, temp markers used by actions?
-
-				mid = m.getAttribute(uniqueID_).toString();
-				ml = m.getAttribute(IMarker.LINE_NUMBER).toString();
-				// mlpi = m.getAttribute(IDs.LINE).toString();
-			} catch (Exception e1) {
-				// ignore errors; only tracing for now.
-				System.out
-						.println("ATV.UpdateVisitor error getting marker info "); //$NON-NLS-1$
-				e1.printStackTrace();
-			}
-			if (traceOn)
-				System.out.println("    markerID_=" + mid //$NON-NLS-1$
-						+ "  lineNo(mkr-mpiA)=" + ml + "-" + mlpi); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-	} // end class UpdateVisitor
-	
-	class ArtifactFilter extends ViewerFilter{
-
-		@Override
-		public boolean select(Viewer viewer, Object parentElement, Object element) {
-			if(element instanceof IMarker){
-				IMarker marker = (IMarker)element;
-				try {
-					Object obj=marker.getAttribute("foo"); //$NON-NLS-1$
-					System.out.println("obj="+obj); //$NON-NLS-1$
-				} catch (CoreException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-			}
-			return false;
-		}
-		
-	}
-
-}
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/views/SimpleTreeTableMarkerView.java b/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/views/SimpleTreeTableMarkerView.java
deleted file mode 100644
index 7d7eb6b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.common/src/org/eclipse/ptp/pldt/common/views/SimpleTreeTableMarkerView.java
+++ /dev/null

@@ -1,1744 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,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.common.views;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IMarkerDelta;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.ptp.pldt.common.ArtifactManager;
-import org.eclipse.ptp.pldt.common.CommonPlugin;
-import org.eclipse.ptp.pldt.common.IArtifact;
-import org.eclipse.ptp.pldt.common.messages.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeColumn;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.ui.texteditor.MarkerUtilities;
-
-/**
- * Like SimpleTableMarkerView - easy view that shows markers - but uses a TreeTable to
- * show some hierarchy. Currently limited to one level of hierarchy
- * 
- * Intent: Markers are the leaf nodes.<br>
- * An attribute in the markers indicates the (artificial) parent node, for
- * grouping.
- * 
- * 
- */
-public class SimpleTreeTableMarkerView extends ViewPart {
-	protected TreeViewer viewer;
-
-	/**
-	 * marker attribute indicating parent node. All markers with this parentAttr
-	 * will be the children of the same parent, and a node for that parent will
-	 * be created so that the poor things won't be orphans. It's 4am what can I
-	 * say?
-	 */
-	protected String parentMarkerAttrib = "parent"; //$NON-NLS-1$
-
-	private Tree tree; // keep so we can dispose of listeners in dispose()?
-
-	protected Action infoAction;
-
-	private Action filterAction;
-
-	private Action doubleClickAction;
-
-	private static final boolean traceOn = false;
-
-	private static final boolean traceStatusLine = false;
-
-	protected ViewerSorter nameSorter;
-
-	protected GenericSorter lineNoSorter;
-
-	protected FilenameSorter filenameSorter;
-
-	protected GenericSorter orderSorter; // by "icon"
-
-	protected GenericSorter nameArtifactSorter;
-
-	protected GenericSorter constructSorter;
-
-	private IMarker selectedMarker_ = null;
-
-	/**
-	 * List of artifacts that were changed due to some action upon them in the
-	 * view (currently unused)
-	 */
-	protected StackList changedArts_ = new StackList();
-
-	/**
-	 * List of markers that were involved in a change on the the associated
-	 * artifact due to some action upon them here in the view (currently unused)
-	 */
-	protected StackList changedMarkers_ = new StackList();
-
-	protected UpdateVisitor visitor_ = new UpdateVisitor();
-
-	/**
-	 * Be consistent about what we call these things; generic values (can be)
-	 * replaced on ctor. <br>
-	 * These are read from plugin.xml if not passed on ctor
-	 */
-	protected String thingname_ = Messages.SimpleTreeTableMarkerView_1;
-
-	protected String thingnames_ = Messages.SimpleTreeTableMarkerView_2;
-
-	private String columnName_ = Messages.SimpleTreeTableMarkerView_3;
-
-	private AbstractUIPlugin thePlugin_;
-
-	private String iconName_ = "icons/sample.gif"; //$NON-NLS-1$
-
-	private String viewName_;
-
-	private String markerID_;
-
-	protected ArtifactManager artifactManager_;
-
-	private String[] columnNames_;
-
-	private String[] markerAttrNames_;
-
-	/**
-	 * The ID used in the marker for the unique ID for each artifact. Enables
-	 * mapping back to the Artifact object if necessary.
-	 */
-	protected String uniqueID_ = "uniqueID"; //$NON-NLS-1$
-
-	/**
-	 * The ID used in the marker for the extra column of information (last
-	 * column)
-	 */
-	protected String columnID_ = "constructType"; // id for (variable) //$NON-NLS-1$
-
-	/** Marker ID for artifact name - e.g. API name, pragma name, etc. */
-	protected static final String NAME = "name"; //$NON-NLS-1$
-
-	/** Marker ID for storage of the filename in which the artifact is found */
-	protected static final String FILENAME = "filename"; //$NON-NLS-1$
-
-	/**
-	 * Marker id for storage of line number on which the artifact is found.
-	 * Reuse of default ID used by IMarker, repeated here for ease of use and
-	 * for clarity that THIS is the marker ID for line number.
-	 */
-	protected static final String LINE = IMarker.LINE_NUMBER;
-
-	/** Marker id for storage of additional information about the artifact */
-	protected static final String DESCRIPTION = "description"; //$NON-NLS-1$
-
-	public static final int NONE = 0;
-
-	public static final int FUNCTION_CALL = 1;
-
-	public static final int CONSTANT = 2;
-
-	/** types of constructs, for the default case */
-	public static final String[] CONSTRUCT_TYPE_NAMES = { Messages.SimpleTreeTableMarkerView_none, Messages.SimpleTreeTableMarkerView_function_call, org.eclipse.ptp.pldt.common.messages.Messages.SimpleTreeTableMarkerView_constant };
-
-	/**
-	 * Simple Artifact Table View constructor
-	 * <p>
-	 * Everything can be null, and defaults will be taken, or read from
-	 * plugin.xml for the view.
-	 * <p>
-	 * Note: if a null plugIn instance is provided, the default plugin (this
-	 * one) will not be able to find resources (e.g. icon images) if the derived
-	 * class is in its own plug-in, and its icons are, too.
-	 */
-	public SimpleTreeTableMarkerView(AbstractUIPlugin thePlugin, String thingname, String thingnames,
-			String columnName, String markerID, String parentMarkerAttrName) {
-
-		if (thePlugin == null) {
-			thePlugin_ = CommonPlugin.getDefault();
-		} else {
-			this.thePlugin_ = thePlugin;
-		}
-		if (thingname != null)
-			this.thingname_ = thingname;
-		if (thingnames != null)
-			this.thingnames_ = thingnames;
-		if (columnName != null) {
-			this.columnName_ = columnName; // last column named by subclass
-		}
-		this.markerID_ = markerID;// if null, will use view id.
-		this.parentMarkerAttrib=parentMarkerAttrName;
-
-		findViewInfo();
-
-	}
-
-	/**
-	 * Simple table view with an arbitrary number of extra columns
-	 * 
-	 * @param thePlugin
-	 * @param thingname
-	 * @param thingnames
-	 * @param attrNames
-	 *            list of marker attributes, for which the column values will be
-	 *            extractd
-	 * @param colNames
-	 *            list of Column names, used as headers for the values found in
-	 *            the marker attributes
-	 * @param markerID_
-	 */
-	public SimpleTreeTableMarkerView(AbstractUIPlugin thePlugin, String thingname, String thingnames,
-			String[] attrNames, String[] colNames, String markerID, String parentMarkerAttribName) {
-		this(thePlugin, thingname, thingnames, null, markerID, parentMarkerAttribName);
-		columnNames_ = colNames;
-		columnName_ = null;// set this so we can tell we are using array of
-		// attrs/cols
-		markerAttrNames_ = attrNames;
-
-	}
-
-	/**
-	 * Ctor that uses defaults for everything (testing? theoretically, this
-	 * should work, and should be reusable since info that must be unique is
-	 * read from from plugin.xml.)
-	 * 
-	 */
-	public SimpleTreeTableMarkerView() {
-		this(null, null, null, null, null,null);
-	}
-
-	/**
-	 * Find info from the view info in the manifest. This includes the icon
-	 * name, the view id (used as marker id if none given on ctor), and
-	 * constructs an artifact manager for this view's artifact objects
-	 * 
-	 */
-	protected void findViewInfo() {
-		String classname = this.getClass().getName();
-		// try to find the icon specified in the plugin.xml for this
-		// extension/view
-		IExtension[] ext = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.ui.views").getExtensions(); //$NON-NLS-1$
-		for (int i = 0; i < ext.length; i++) {
-			IExtension extension = ext[i];
-			IConfigurationElement[] ces = extension.getConfigurationElements();
-			for (int j = 0; j < ces.length; j++) {
-				IConfigurationElement cElement = ces[j];
-				String iconName = cElement.getAttribute("icon"); //$NON-NLS-1$
-				String classN = cElement.getAttribute("class"); //$NON-NLS-1$
-				String name = cElement.getAttribute("name"); //$NON-NLS-1$
-				if (classname.equals(classN)) {
-					if (iconName != null) {
-						iconName_ = iconName;
-					}
-					this.viewName_ = name;
-					if (markerID_ == null) {
-						// use plugin id for marker id, if not specified
-						markerID_ = cElement.getAttribute("id"); //$NON-NLS-1$
-					}
-					artifactManager_ = ArtifactManager.getManager(markerID_);
-					if (artifactManager_ == null) {
-						artifactManager_ = new ArtifactManager(markerID_);
-					}
-				}
-
-			}
-
-		}
-	}
-
-	/**
-	 * It might be useful for subclasses to override this, to say which
-	 * filenames should allow the action "run analysis" to create new artifacts
-	 * and thus new markers. <br>
-	 * This is a default implementation
-	 * 
-	 * @param filename
-	 * @return
-	 */
-	public boolean validForAnalysis(String filename) {
-		// return MpiUtil.validForAnalysis(filename);
-		return true;
-
-	}
-
-	/**
-	 * The content provider class is responsible for providing objects to the
-	 * view. It can wrap existing objects in adapters or simply return objects
-	 * as-is. These objects may be sensitive to the current input of the view,
-	 * or ignore it and always show the same content (like Task List, for
-	 * example).
-	 */
-	class ViewContentProvider implements IStructuredContentProvider, ITreeContentProvider, IResourceChangeListener {
-		private IResource input;
-
-		private List<ParentNode> parentList = new ArrayList<ParentNode>();
-
-		private boolean hasRegistered = false;
-
-		public void inputChanged(Viewer v, Object oldInput, Object newInput) {
-			// could use this to change the list to just artifacts from one
-			// resource,
-			// etc...
-			// could cache viewer here this.viewer=v;
-			if (traceOn)
-				System.out.println("ATV inputChanged()..."); //$NON-NLS-1$
-			// if this is the first time we have been given an input
-			if (!hasRegistered) {
-				// add me as a resource change listener so i can refresh at
-				// least when markers are changed
-				// POST_CHANGE: only want event notifications for after-the-fact
-				ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
-				hasRegistered = true;
-				if (traceOn)
-					System.out.println("ATV: Registered RCL for ViewContentProvider"); //$NON-NLS-1$
-			}
-			if (newInput instanceof IResource) {
-				this.input = (IResource) newInput;
-			}
-
-		}
-
-		public void dispose() {
-			if (traceOn)
-				System.out.println("ATV.ViewContentProvider.dispose()"); //$NON-NLS-1$
-			ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-
-		}
-
-		/**
-		 * Get the list of objects to populate this view.
-		 */
-		public Object[] getElements(Object parent) {
-			Object[] objs = null;
-			try {
-				String id = markerID_;
-				if (input == null) {
-					if (traceOn)
-						System.out.println("input is null in getElements..."); //$NON-NLS-1$
-				}
-				objs = input.findMarkers(id, false, IResource.DEPTH_INFINITE);
-				parentList=createParents(objs);
-			} catch (CoreException e) {
-				System.out.println("ATV, exception getting model elements (markers for Table view)"); //$NON-NLS-1$
-				e.printStackTrace();
-			}
-			if (traceOn)
-				System.out.println("ATV.get---Elements, found " + objs.length + " markers"); //$NON-NLS-1$ //$NON-NLS-2$
-			return parentList.toArray();
-
-		}
-
-		/**
-		 * create the parent objects needed for these markers
-		 * 
-		 * @param objs
-		 * @return
-		 */
-		private List<ParentNode> createParents(Object[] objs) {
-			// remove (old) parent objects
-			parentList = new ArrayList<ParentNode>();
-
-			IMarker[] markers = (IMarker[]) objs;
-			for (int i = 0; i < markers.length; i++) {
-				IMarker marker = markers[i];
-				String parentName = getParentAttr(marker);
-				// make one single parent, if attrs don't have parent info (yet)
-				if(parentName==null) {
-					parentName="dummy"; //$NON-NLS-1$
-				}
-				getParentNode(parentName);
-			}
-			return parentList;
-		}
-
-		private String getParentAttr(IMarker marker) {
-			String parentName = null;
-			try {
-				parentName = (String) marker.getAttribute(parentMarkerAttrib);
-				// temporary override to create an intial parent for all
-				if( parentName==null)
-					parentName="dummy"; //$NON-NLS-1$
-			} catch (CoreException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-			
-			return parentName;
-		}
-
-		/**
-		 * get the parent node with the given name. If one doesn't exist, can create
-		 * it.
-		 * 
-		 * @param parentName
-		 *            the marker attribute with the name of the parent required
-		 * @param createIfNeeded whether or not to create the parent node if we don't
-		 * find one already exists
-		 * @return
-		 */
-		private ParentNode getParentNode(String parentName, boolean createIfNeeded) {
-			ParentNode parentNode;
-			for (Iterator iter = parentList.iterator(); iter.hasNext();) {
-				parentNode = (ParentNode) iter.next();
-				if (parentNode.parentAttrName.equals(parentName)) {
-					return parentNode;
-				}
-			}
-			// not found; make a new one
-			parentNode=null;
-			if (createIfNeeded) {
-				parentNode = new ParentNode(parentName);
-				parentList.add(parentNode);
-			}
-			return parentNode;
-		}
-
-		private ParentNode getParentNode(String parentName) {
-			final boolean createIfNeeded = false;
-			return getParentNode(parentName, createIfNeeded);
-		}
-
-		/**
-		 * react to a resource change event
-		 * 
-		 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
-		 */
-
-		public void resourceChanged(IResourceChangeEvent event) {
-			if (traceOn)
-				System.out.println("-----------------resourceChanged()"); //$NON-NLS-1$
-			final IResourceDelta delta = event.getDelta();
-			if (traceOn)
-				printResourcesChanged(delta, 1);
-			// remove the following when resource delta visitor does it all?
-			Control ctrl = viewer.getControl();
-			if (ctrl != null && !ctrl.isDisposed()) {
-				ctrl.getDisplay().syncExec(new Runnable() {
-					public void run() {
-						try {
-							if (traceOn)
-								System.out.println("viewer.update ea mkr in delta-- from resourceChanged()..."); //$NON-NLS-1$
-							if (traceOn)
-								System.out.println("----processResourceChangeDelta()..."); //$NON-NLS-1$
-							processResourceChangeDelta(delta);
-							if (traceOn)
-								System.out.println("----END processResourceChangeDelta()..."); //$NON-NLS-1$
-							if (traceOn)
-								System.out.println("viewer.refresh()"); //$NON-NLS-1$
-							// we should have updated the indiv. rows we care
-							// about,
-							// but need this for Marker display after initial
-							// analysis,
-							// and for markers deleted, etc. Can remove when we
-							// more completely
-							// handle things in processResourceChangeDelta
-							// (removes etc.)
-							viewer.refresh();
-
-						} catch (Exception e) {
-							System.out.println("ATV: Exception refreshing viewer: " + e); //$NON-NLS-1$
-							e.printStackTrace();
-						}
-
-					}
-				});
-			}
-			if (traceOn)
-				System.out.println("-----------------END resourceChanged()\n"); //$NON-NLS-1$
-
-		}
-
-		/**
-		 * Debugging statement help - prints the events, indented by nesting
-		 * level
-		 * 
-		 * @param delta
-		 * @param indent
-		 */
-		private void printResourcesChanged(IResourceDelta delta, int indent) {
-			printOneResourceChanged(delta, indent);
-			IResourceDelta[] children = delta.getAffectedChildren();
-			for (int i = 0; i < children.length; i++)
-				printResourcesChanged(children[i], indent + 1);
-		}
-
-		/**
-		 * Some debugging statement help
-		 * 
-		 * @param delta
-		 * @param indent
-		 */
-		private void printOneResourceChanged(IResourceDelta delta, int indent) {
-			StringBuffer buf = new StringBuffer(80);
-			for (int i = 0; i < indent; i++)
-				buf.append("  "); //$NON-NLS-1$
-			switch (delta.getKind()) {
-			case IResourceDelta.ADDED:
-				buf.append("ADDED"); //$NON-NLS-1$
-				break;
-			case IResourceDelta.REMOVED:
-				buf.append("REMOVED"); //$NON-NLS-1$
-				break;
-			case IResourceDelta.CHANGED:
-				buf.append("CHANGED"); //$NON-NLS-1$
-				testDelta(delta);
-				break;
-			default:
-				buf.append("["); //$NON-NLS-1$
-				buf.append(delta.getKind());
-				buf.append("]"); //$NON-NLS-1$
-				break;
-			}
-			buf.append(" "); //$NON-NLS-1$
-			buf.append(delta.getResource());
-			System.out.println(buf);
-		}
-
-		/**
-		 * Show debugging info for a resource delta change
-		 * 
-		 * @param delta
-		 */
-		private void testDelta(IResourceDelta delta) {
-			// -- code from eclipse help:
-			// case IResourceDelta.CHANGED:
-			System.out.print("Resource "); //$NON-NLS-1$
-			System.out.print(delta.getFullPath());
-			System.out.println(" has changed."); //$NON-NLS-1$
-			int flags = delta.getFlags();
-			if ((flags & IResourceDelta.CONTENT) != 0) {
-				System.out.println("--> Content Change"); //$NON-NLS-1$
-			}
-			if ((flags & IResourceDelta.REPLACED) != 0) {
-				System.out.println("--> Content Replaced"); //$NON-NLS-1$
-			}
-			if ((flags & IResourceDelta.MARKERS) != 0) {
-				System.out.println("--> Marker Change"); //$NON-NLS-1$
-				// IMarkerDelta[] markers = delta.getMarkerDeltas();
-				// if interested in markers, check these deltas
-			}
-		}
-
-		/**
-		 * Process the resource change - just the delta
-		 * 
-		 * @param delta
-		 */
-		protected void processResourceChangeDelta(IResourceDelta delta) {
-			try {
-				delta.accept(visitor_);
-
-			} catch (CoreException e2) {
-				System.out.println("Error in PITV.processResourceChangeDelta().."); //$NON-NLS-1$
-				e2.printStackTrace();
-			}
-		}
-
-		/**
-		 * get the children (markers) of a parent node
-		 */
-		public Object[] getChildren(Object parentElement) {
-			ParentNode parentnode = (ParentNode) parentElement;
-			String parentName = parentnode.getParentAttrName();
-			IMarker[] markers = null;
-			try {
-				markers = input.findMarkers(markerID_, false, IResource.DEPTH_INFINITE);
-			} catch (CoreException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-			List<IMarker> children = new ArrayList<IMarker>();
-			for (int i = 0; i < markers.length; i++) {
-				IMarker marker = markers[i];
-				String parentAttr = getParentAttr(marker);
-				if (parentAttr.equals(parentName)) {
-					children.add(marker);
-				}
-			}
-			return children.toArray();
-		}
-
-		public Object getParent(Object element) {
-			IMarker marker = (IMarker) element;
-			ParentNode parent = getParent(marker, false);
-			return parent;
-		}
-
-		private ParentNode getParent(IMarker marker, boolean b) {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		public boolean hasChildren(Object element) {
-			Object[] kids=getChildren(element);
-			return kids.length>0;
-		}
-
-	} // end ViewContentProvider
-
-	class ParentNode {
-		private String parentAttrName;
-
-		public ParentNode(String parentName) {
-			this.parentAttrName = parentName;
-		}
-
-		public String getParentAttrName() {
-			return parentAttrName;
-		}
-
-	}
-
-	/**
-	 * get artifact from marker
-	 * 
-	 * @param marker
-	 * @return
-	 */
-	protected IArtifact getSimpleArtifact(IMarker marker) {
-		String id = null;
-		IArtifact artifact = null;
-		try {
-			id = (String) marker.getAttribute(uniqueID_);
-			artifact = artifactManager_.getArtifact(id);
-
-		} catch (CoreException e) {
-			// e.printStackTrace();
-			System.out.println(e.getMessage() + " ... STV, CoreException getting artifact from hashMap; " + thingname_ //$NON-NLS-1$
-					+ " id=" + id); //$NON-NLS-1$
-		} catch (NullPointerException ne) {
-			System.out.println(ne.getMessage() + " ... STV, NullPtrExcp getting artifact from hashMap;" + thingname_ //$NON-NLS-1$
-					+ " id=" + id); //$NON-NLS-1$
-		}
-		return artifact;
-
-	}
-
-	/**
-	 * Get string representing the type of construct
-	 * 
-	 * @param marker
-	 * @return
-	 * @throws CoreException
-	 */
-	protected String getConstructStr(IMarker marker) throws CoreException {
-		Integer temp = (Integer) marker.getAttribute(columnID_);
-		if (temp != null) {
-			Integer constructType = (Integer) temp;
-			return CONSTRUCT_TYPE_NAMES[constructType.intValue()];
-		} else
-			return " "; //$NON-NLS-1$
-	}
-
-	/**
-	 * 
-	 * ViewLabelProvider - provides the text and images for the artifacts in the
-	 * Table View
-	 * 
-	 * @author Beth Tibbitts
-	 * 
-	 * 
-	 */
-	class ViewLabelProvider extends LabelProvider implements ITableLabelProvider {
-		/**
-		 * Keep icons already created, and reuse the images
-		 */
-		private HashMap iconHash = new HashMap();
-
-		private IArtifact artifact;
-
-		/**
-		 * provide what goes in each column; get the info from the marker
-		 */
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-		 */
-		public String getText(Object o) {
-			String temp = super.getText(o);
-			// System.out.println("Text: " + temp);
-			return temp;
-		}
-
-		/**
-		 * Determine the text to go in each column
-		 * 
-		 * @param obj
-		 *            the Marker (we hope) that goes on the current row
-		 * @param index
-		 *            the column number in the table
-		 * 
-		 */
-		public String getColumnText(Object obj, int index) {
-			if (obj == null) {
-				System.out.println("ATV: LabelProv obj is null; index=" + index); //$NON-NLS-1$
-				return "ATV obj null"; //$NON-NLS-1$
-			}
-			IMarker marker = (IMarker) obj;
-			try {
-				switch (index) {
-				case 0:
-					return ""; //$NON-NLS-1$
-				case 1:
-					String id = (String) marker.getAttribute(NAME);
-					return id;
-				case 2:
-
-					return (String) marker.getAttribute(FILENAME);
-				case 3:
-					String line = (marker.getAttribute(IMarker.LINE_NUMBER)).toString();
-
-					if (traceOn) { // all this is for debugging purposes so
-						artifact = getSimpleArtifact(marker);
-						String compLine = line + "-"; //$NON-NLS-1$
-						if (artifact == null) {
-							if (traceOn)
-								System.out.println("ATV getColumnText- null artifact"); //$NON-NLS-1$
-						} else {
-							int lineArtifact = artifact.getLine();
-							compLine = compLine + lineArtifact;
-						}
-						System.out.println("ATV.ViewLabelProvider gets marker line: mkr-artifact: " + compLine); //$NON-NLS-1$
-						showMarker(marker);
-					}
-					return line;
-				case 4:
-					if (columnName_ != null) {// we're not using array
-						return getConstructStr(marker);
-					}
-					// else drop through...
-
-				default:
-					String attrName = markerAttrNames_[index - 4];
-					String val = marker.getAttribute(attrName, ""); //$NON-NLS-1$
-					return val;
-				}
-			} catch (CoreException ce) {
-				// get this error 3x "Marker id: 999 not found." while deleting
-				// markers. why?
-				// Why is this even getting called, and why does it matter?
-				// String tmp = ce.getMessage();
-				// ce.printStackTrace();
-				return ("ATV error"); //$NON-NLS-1$
-			}
-		}
-
-		/**
-		 * Provide the image that goes in a column, if any (Note that a table
-		 * cell can contain both, an image and text, which will be displayed
-		 * side-by-side)
-		 * 
-		 * @param obj -
-		 *            the object we're getting the image for
-		 * @param index -
-		 *            the column that this image is to go in
-		 */
-		public Image getColumnImage(Object obj, int index) {
-			// we only put image icon in the first column
-			switch (index) {
-			case 0:
-				return getCustomImage(obj);
-			default:
-				return null;
-			}
-		}
-
-		/**
-		 * Get image for artifact. Note that different images could be used for
-		 * different types of artifacts. For now we have a single image.
-		 * 
-		 * @param obj
-		 *            the marker object that this artifact is represented by
-		 * @return image for marker
-		 *         <p>
-		 *         Note: if a null plugIn instance is provided on the view ctor,
-		 *         the default plugin (this one) will not be able to find
-		 *         resources (e.g. icon images) if the derived class is in its
-		 *         own plug-in, and its icons are, too.
-		 * 
-		 */
-		protected Image getCustomImage(Object obj) {
-			// if we've already created one of this type of icon, reuse it.
-			// Note: use ImageRegistry instead?
-			Image img = (Image) iconHash.get(iconName_);
-			if (img == null) {
-				Path path = new Path(iconName_);
-				// BRT make sure the specific plugin is being used here to find
-				// its OWN icons
-				URL url = thePlugin_.find(path);
-				ImageDescriptor id = ImageDescriptor.createFromURL(url);
-				img = id.createImage();
-				if (traceOn)
-					System.out.println("ATV: ***** created image for " + iconName_); //$NON-NLS-1$
-				iconHash.put(iconName_, img);// save for reuse
-			}
-			return img;
-		}
-
-		/**
-		 * Dispose of anything that would hang around rudely otherwise (such as
-		 * image objects from the icons)
-		 * 
-		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-		 */
-
-		public void dispose() {
-			if (traceOn)
-				System.out.println("ATV.ViewLabelProvider.dispose(); dispose of icon images"); //$NON-NLS-1$
-			for (Iterator iter = iconHash.values().iterator(); iter.hasNext();) {
-				Image img = (Image) iter.next();
-				img.dispose();
-			}
-			super.dispose();
-		}
-
-	}
-
-	/**
-	 * Default sorter for items - the order they were created, which tends to
-	 * group items with their source code locations
-	 * 
-	 * @author Beth Tibbitts
-	 */
-	class NameSorter extends ViewerSorter {
-	}
-
-	/**
-	 * Sort items by one or more of: artifact, filename, lineNo,
-	 * variableColumnName.<br>
-	 * The derived classes will implement combine() to say how the attributes
-	 * are combined to get the sort desired.
-	 * 
-	 * @author Beth Tibbitts
-	 */
-	abstract class GenericSorter extends ViewerSorter {
-		protected boolean ascending = true;
-
-		/**
-		 * Compare two items to determine sort order. Sort items by one or more
-		 * of: artifact name, then file, then line number, then construct
-		 */
-		public int compare(Viewer viewer, Object e1, Object e2) {
-			int result = 0;
-
-			int cat1 = category(e1);
-			int cat2 = category(e2);
-
-			if (cat1 != cat2)
-				return cat1 - cat2;
-
-			java.text.Collator collator = this.getCollator();
-
-			if (e1 instanceof IMarker) {
-				try {
-					IMarker m1 = (IMarker) e1;
-					IMarker m2 = (IMarker) e2;
-					String name1 = (String) m1.getAttribute(NAME);
-					String file1 = (String) m1.getAttribute(FILENAME);
-
-					String line1 = (String) m1.getAttribute(LINE).toString();
-					String construct1 = getConstructStr(m1);
-					String sort1 = combine(name1, file1, line1, construct1);
-
-					String name2 = (String) m2.getAttribute(NAME);
-					String file2 = (String) m2.getAttribute(FILENAME);
-					String line2 = (String) m2.getAttribute(LINE).toString();
-					String construct2 = getConstructStr(m2);
-					String sort2 = combine(name2, file2, line2, construct2);
-
-					if (ascending)
-						result = collator.compare(sort1, sort2);
-					else
-						result = collator.compare(sort2, sort1);
-
-					return result;
-				} catch (CoreException e) {
-					e.printStackTrace();
-				}
-			}
-			return 0;
-
-		}
-
-		/**
-		 * Combine name, file, and/or line number to provide the string to sort
-		 * by. Will be overridden by derived classes as needed
-		 * 
-		 * @param name
-		 * @param file
-		 * @param line
-		 * @param construct
-		 * @return always return null, subclass can choose to impl. this method.
-		 */
-		protected String combine(String name, String file, String line, String construct) {
-			return null;
-		}
-
-		/**
-		 * switch to this sorter. If it was already this sorter, then toggle the
-		 * sort order
-		 * 
-		 */
-		public void sort() {
-			// String className = this.getClass().getName();
-			// System.out.println(className+".sort() ascending="+ascending);
-			if (this == viewer.getSorter()) {
-				ascending = !ascending;
-				viewer.setSorter(null); // turn off to force re-sort
-			} else {
-				ascending = true;
-			}
-			viewer.setSorter(this);
-
-		}
-
-	}
-
-	/**
-	 * Sorter to sort by line number on which the SimpleArtifact is Found
-	 * 
-	 * @author Beth Tibbitts created
-	 * 
-	 * 
-	 */
-	class LineNoSorter extends GenericSorter {
-		/**
-		 * sort items by line number
-		 */
-		public int compare(Viewer viewer, Object e1, Object e2) {
-
-			int cat1 = category(e1);
-			int cat2 = category(e2);
-
-			if (cat1 != cat2)
-				return cat1 - cat2;
-
-			if (e1 instanceof IMarker) {
-				try {
-					IMarker m1 = (IMarker) e1;
-					Object tempObj = m1.getAttribute(LINE);
-					int line1 = 0;
-					int line2 = 0;
-					if (tempObj instanceof Integer) {
-						line1 = ((Integer) tempObj).intValue();
-						IMarker m2 = (IMarker) e2;
-						tempObj = m2.getAttribute(LINE);
-						// we assume if the first was Integer, this one is, too.
-						assert tempObj instanceof Integer;
-						line2 = ((Integer) tempObj).intValue();
-
-					}
-					int result = 0;
-					if (ascending)
-						result = line1 - line2;
-					else
-						result = line2 - line1;
-
-					return result;
-				} catch (CoreException e) {
-					e.printStackTrace();
-				}
-			}
-			return 0;
-
-		}
-	}
-
-	/**
-	 * Sort items by name
-	 * 
-	 * @author Beth Tibbitts
-	 * 
-	 * 
-	 */
-	class NameArtifactSorter extends GenericSorter {
-
-		/**
-		 * @param name
-		 * @param file
-		 * @param line
-		 * @param construct
-		 * @return BRT note: Sort isn't quite right: if name,filename identical,
-		 *         "10" would sort before "2" e.g.
-		 */
-		protected String combine(String name, String file, String line, String construct) {
-			final String delim = " - "; //$NON-NLS-1$
-			StringBuffer result = new StringBuffer(name);
-			result.append(delim);
-			result.append(file);
-			result.append(delim);
-			result.append(line);
-			result.append(delim);
-			result.append(construct);
-			return result.toString();
-		}
-	}
-
-	/**
-	 * Sort items by filename (then line number)
-	 * 
-	 * @author Beth Tibbitts
-	 * 
-	 * 
-	 */
-	class FilenameSorter extends GenericSorter {
-		public int compare(Viewer viewer, Object e1, Object e2) {
-
-			int cat1 = category(e1);
-			int cat2 = category(e2);
-
-			if (cat1 != cat2)
-				return cat1 - cat2;
-			int res = 0;
-			try {
-				IMarker m1 = (IMarker) e1;
-				IMarker m2 = (IMarker) e2;
-				String file1 = (String) m1.getAttribute(FILENAME);
-				String file2 = (String) m2.getAttribute(FILENAME);
-				if(traceOn)System.out.println("ascending=" + ascending); //$NON-NLS-1$
-				if (ascending)
-					res = collator.compare(file1, file2);
-				else
-					res = collator.compare(file2, file1);
-				// if the filename is the same, only then do we look at line
-				// number
-				if (res == 0) {
-					String line1 = m1.getAttribute(LINE).toString();
-					String line2 = m2.getAttribute(LINE).toString();
-					int l1 = Integer.parseInt(line1);
-					int l2 = Integer.parseInt(line2);
-					if (ascending)
-						res = l1 - l2;
-					else
-						res = l2 - l1;
-				}
-				// if the filename and line no are the same, only then do we
-				// look at construct
-				if (res == 0) {
-					if (ascending) {
-						res = collator.compare(getConstructStr(m1), getConstructStr(m2));
-					} else {
-						res = collator.compare(getConstructStr(m2), getConstructStr(m1));
-					}
-				}
-			} catch (CoreException e) {
-				e.printStackTrace();
-			}
-			return res;
-		}
-	}
-
-	class ConstructSorter extends GenericSorter {
-
-		/**
-		 * @param name
-		 * @param file
-		 * @param line
-		 * @param construct
-		 * @return BRT note: Sort isn't quite right: if name,filename identical,
-		 *         "10" would sort before "2" e.g.
-		 */
-		protected String combine(String name, String file, String line, String construct) {
-			final String delim = " - "; //$NON-NLS-1$
-			StringBuffer result = new StringBuffer(construct);
-			result.append(delim);
-			result.append(name);
-			result.append(delim);
-			result.append(file);
-			result.append(delim);
-			result.append(line);
-			return result.toString();
-		}
-	}
-
-	/**
-	 * This is a callback that will allow us to create the viewer and initialize
-	 * it.
-	 */
-	public void createPartControl(Composite parent) {
-		tree = new Tree(parent, SWT.BORDER);
-		tree.setLinesVisible(true);
-		tree.setHeaderVisible(true);
-
-		TreeColumn column;
-		column = new TreeColumn(tree, SWT.LEFT); // col 1
-		column = new TreeColumn(tree, SWT.LEFT); // col 2
-		column = new TreeColumn(tree, SWT.LEFT); // col 3
-		column = new TreeColumn(tree, SWT.LEFT); // col 4
-
-		// Widget created and customized and then passed to viewer during
-		// creation :
-/*		Table table = new Table(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI | SWT.FULL_SELECTION);
-		TableLayout layout = new TableLayout();
-		table.setLayout(layout);
-		table.setLinesVisible(true);
-		table.setHeaderVisible(true);
-		String[] STD_HEADINGS = { " ", thingname_, "Filename", "LineNo", this.columnName_ };
-
-		layout.addColumnData(new ColumnWeightData(1, 1, true));
-		TableColumn tc0 = new TableColumn(table, SWT.NONE);
-		tc0.setText(STD_HEADINGS[0]);
-		tc0.setAlignment(SWT.LEFT);
-		tc0.setResizable(true);
-
-		layout.addColumnData(new ColumnWeightData(10, true));
-		TableColumn tc1 = new TableColumn(table, SWT.NONE);
-		tc1.setText(STD_HEADINGS[1]);
-		tc1.setAlignment(SWT.LEFT);
-		tc1.setResizable(true);
-
-		layout.addColumnData(new ColumnWeightData(10, true));
-		TableColumn tc2 = new TableColumn(table, SWT.NONE);
-		tc2.setText(STD_HEADINGS[2]);
-		tc2.setAlignment(SWT.LEFT);
-		tc2.setResizable(true);
-
-		layout.addColumnData(new ColumnWeightData(5, true));
-		TableColumn tc3 = new TableColumn(table, SWT.NONE);
-		tc3.setText(STD_HEADINGS[3]);
-		tc3.setAlignment(SWT.LEFT);
-		tc3.setResizable(true);
-
-		TableColumn tc4 = null;
-		if (this.columnName_ != null) {
-			layout.addColumnData(new ColumnWeightData(5, true));
-			tc4 = new TableColumn(table, SWT.NONE);
-			tc4.setText(STD_HEADINGS[4]);
-			tc4.setAlignment(SWT.LEFT);
-			tc4.setResizable(true);
-		} else {
-			int numCols = columnNames_.length;
-			TableColumn[] tableCols = new TableColumn[numCols];
-			for (int i = 0; i < numCols; i++) {
-				layout.addColumnData(new ColumnWeightData(5, true));
-				TableColumn tc = new TableColumn(table, SWT.NONE);
-				tc.setText(columnNames_[i]);
-				tc.setAlignment(SWT.LEFT);
-				tc.setResizable(true);
-				tableCols[i] = tc;
-			}
-		}
-
-		// add listeners for table sorting
-		// Sort by "icon" (the original sort order, actually)
-		tc0.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent event) {
-				viewer.setSorter(null);
-				viewer.setSorter(nameSorter);
-			}
-
-			public void widgetDefaultSelected(SelectionEvent event) {
-			}
-		});
-		// Sort by artifact name
-		tc1.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent event) {
-				nameArtifactSorter.sort();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent event) {
-			}
-		});
-		// Sort by file name (then by lineNo)
-		tc2.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent event) {
-				filenameSorter.sort();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent event) {
-			}
-		});
-		// Sort by Line number
-		tc3.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent event) {
-				lineNoSorter.sort();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent event) {
-			}
-		});
-		// Sort by Construct (if we're not doing an array of extra columns)
-		if (tc4 != null) {
-			tc4.addSelectionListener(new SelectionListener() {
-				public void widgetSelected(SelectionEvent event) {
-					constructSorter.sort();
-				}
-
-				public void widgetDefaultSelected(SelectionEvent event) {
-				}
-			});
-		}
-*/
-		// Selection listener to know when a table row is selected.
-
-		//table.addSelectionListener(new SelectionAdapter() {
-		tree.addSelectionListener(new SelectionAdapter() {
-
-			// public void widgetDefaultSelected(SelectionEvent e) {
-			// // System.out.println("widgetDefaultSelected");
-			// }
-
-			public void widgetSelected(SelectionEvent e) {
-				Object obj = e.getSource();
-				if (obj instanceof Table) {
-					Table t = (Table) obj;
-					int row = t.getSelectionIndex();
-					// rowSelected_ = row;
-					// print marker info when selected in table
-					if (traceOn) {
-						TableItem ti = t.getItem(row);
-						IMarker marker = (IMarker) ti.getData();
-						IArtifact artifact = getSimpleArtifact(marker);
-						String id = marker.getAttribute(uniqueID_, "(error)"); //$NON-NLS-1$
-						int mLine = MarkerUtilities.getLineNumber(marker);
-						int lineNo = 0;
-						if (artifact != null)
-							lineNo = artifact.getLine();
-
-						if (traceOn)
-							System.out.println("MARKER id=" + id + " mkrLineNo=" + mLine + " artifactLineNo=" + lineNo); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					}
-
-				}
-			}
-		});
-
-		viewer = new TreeViewer(tree);
-		viewer.setContentProvider(new ViewContentProvider());
-		viewer.setLabelProvider(new ViewLabelProvider());
-		// Set up the sorters.
-		nameSorter = new NameSorter();
-		viewer.setSorter(nameSorter);
-		lineNoSorter = new LineNoSorter();
-		nameArtifactSorter = new NameArtifactSorter();
-		filenameSorter = new FilenameSorter();
-		constructSorter = new ConstructSorter();
-
-		viewer.setInput(ResourcesPlugin.getWorkspace().getRoot());
-		// markers from workspace
-
-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection sel = (IStructuredSelection) event.getSelection();
-				Object obj = sel.getFirstElement();
-				if (obj instanceof IMarker) {
-					selectedMarker_ = (IMarker) obj;
-				}
-				showStatusMessage("", "selectionChanged"); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		});
-
-		makeActions();
-		hookContextMenu();
-		hookDoubleClickAction();
-		contributeToActionBars();
-	}
-
-	private void hookContextMenu() {
-		MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager manager) {
-				SimpleTreeTableMarkerView.this.fillContextMenu(manager);
-			}
-		});
-		Menu menu = menuMgr.createContextMenu(viewer.getControl());
-		viewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(menuMgr, viewer);
-	}
-
-	private void contributeToActionBars() {
-		IActionBars bars = getViewSite().getActionBars();
-		fillLocalPullDown(bars.getMenuManager());
-		fillLocalToolBar(bars.getToolBarManager());
-	}
-
-	private void fillLocalPullDown(IMenuManager manager) {
-		manager.add(infoAction);
-		manager.add(new Separator());
-		manager.add(filterAction);
-	}
-
-	private void fillContextMenu(IMenuManager manager) {
-		manager.add(infoAction);
-		// Other plug-ins can contribute their actions here
-		manager.add(new Separator("Additions")); //$NON-NLS-1$
-	}
-
-	private void fillLocalToolBar(IToolBarManager manager) {
-		manager.add(infoAction);
-	}
-
-	/**
-	 * Make the action objects for the menus and toolbar.
-	 * 
-	 */
-	private void makeActions() {
-		makeShowInfoAction();
-		makeFilterAction();
-		makeDoubleClickAction();
-	}
-
-	/**
-	 * Make "show info" action to display artifact information
-	 */
-	protected void makeShowInfoAction() {
-		infoAction = new Action() {
-			public void run() {
-				String title = thingname_ + Messages.SimpleTreeTableMarkerView_info;
-				if (selectedMarker_ != null) {
-					String idFromMarker = (String) selectedMarker_.getAttribute(uniqueID_, null);
-					if (idFromMarker == null) {
-						System.out.println("ATV: exception reading marker ID"); //$NON-NLS-1$
-						return;
-					}
-					StringBuffer info = new StringBuffer();
-
-					IArtifact artifact = artifactManager_.getArtifact(idFromMarker);
-					info.append(Messages.SimpleTreeTableMarkerView_fileName).append(artifact.getFileName());
-					info.append(Messages.SimpleTreeTableMarkerView_line_no).append(artifact.getLine());
-					info.append(Messages.SimpleTreeTableMarkerView_name).append(artifact.getShortName());
-					info.append(Messages.SimpleTreeTableMarkerView_description).append(artifact.getDescription());
-
-					MessageDialog.openInformation(null, title, info.toString());
-				}// end if selectedMarker!=null
-				else {
-					MessageDialog.openInformation(null, title, Messages.SimpleTreeTableMarkerView_No + thingname_ + Messages.SimpleTreeTableMarkerView_selected);
-				}
-				// ------------------
-			}
-		};
-		infoAction.setText(Messages.SimpleTreeTableMarkerView_show_info);
-		infoAction.setToolTipText(Messages.SimpleTreeTableMarkerView_show_info_tooltip + thingname_);
-		infoAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(
-				ISharedImages.IMG_OBJS_INFO_TSK));
-	}
-
-	/**
-	 * make filter action (TBD)
-	 */
-	private void makeFilterAction() {
-		filterAction = new Action() {
-			public void run() {
-				showMessage(Messages.SimpleTreeTableMarkerView_83 + thingnames_ + Messages.SimpleTreeTableMarkerView_84 + thingnames_ + Messages.SimpleTreeTableMarkerView_85);
-			}
-		};
-		filterAction.setText(Messages.SimpleTreeTableMarkerView_86 + thingnames_);
-		filterAction.setToolTipText(Messages.SimpleTreeTableMarkerView_87 + thingnames_ + Messages.SimpleTreeTableMarkerView_88);
-	}
-
-	/**
-	 * Make double-click action, which moves editor to the artifact instance in
-	 * the source code (editor to line in source code)
-	 * 
-	 */
-	private void makeDoubleClickAction() {
-
-		doubleClickAction = new Action() {
-			public void run() {
-				ISelection selection = viewer.getSelection();
-				Object obj = ((IStructuredSelection) selection).getFirstElement();
-				// This action only makes sense on child nodes (markers)
-				if (!(obj instanceof IMarker)) {
-					return;
-				}
-				IMarker marker = (IMarker) obj;
-				try {
-					IFile f = (IFile) marker.getResource();
-					int lineNo = getMarkerLineNo(marker);
-					if (f != null && f.exists()) {
-						IWorkbenchPage wbp = getSite().getPage();
-						// IEditorInput ieu = new FileEditorInput(f);
-						IEditorPart editor = IDE.openEditor(wbp, f);
-
-						if (traceOn)
-							System.out.println("dca: marker lineNo before " + MarkerUtilities.getLineNumber(marker)); //$NON-NLS-1$
-						// note: (re?) setting linenumber here is required to
-						// put marker in editor!?!
-						MarkerUtilities.setLineNumber(marker, lineNo);
-						if (traceOn)
-							System.out.println("dca: marker lineNo after " + MarkerUtilities.getLineNumber(marker)); //$NON-NLS-1$
-						IDE.gotoMarker(editor, marker);
-						if (traceOn)
-							System.out.println("ATV: DoubleClickAction, clear status"); //$NON-NLS-1$
-						showStatusMessage("", "double click action"); //$NON-NLS-1$ //$NON-NLS-2$
-					}
-				} catch (Exception e) {
-					System.out.println("ATV.doubleclickAction: Error positioning editor page from marker line number"); //$NON-NLS-1$
-					showStatusMessage("Error positioning editor from marker line number", "error marker goto"); //$NON-NLS-1$ //$NON-NLS-2$
-					e.printStackTrace();
-				}
-			}
-		};
-	}
-
-	private void hookDoubleClickAction() {
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				doubleClickAction.run();
-			}
-		});
-	}
-
-	private void showMessage(String message) {
-		MessageDialog.openInformation(viewer.getControl().getShell(), viewName_, message);
-	}
-
-	private void showStatusMessage(String message, String debugMessage) {
-		if (traceStatusLine) {
-			message += " - "; //$NON-NLS-1$
-			message += debugMessage;
-		}
-		getViewSite().getActionBars().getStatusLineManager().setMessage(message);
-		getViewSite().getActionBars().getStatusLineManager().update(true);
-
-	}
-
-	/**
-	 * Passing the focus request to the viewer's control.
-	 */
-	public void setFocus() {
-		showStatusMessage("", "setFocus"); // reset status message //$NON-NLS-1$ //$NON-NLS-2$
-		if (!viewer.getControl().isDisposed())
-			viewer.getControl().setFocus();
-	}
-
-	public void dispose() {
-		if (traceOn)
-			System.out.println("SimpleTableView.dispose()"); //$NON-NLS-1$
-		// BRT do we need to dispose of imageDescriptors we made? or just
-		// images?
-
-	}
-
-	public void showMarker(IMarker marker) {
-		System.out.println("Marker-------  IMarker.LINE_NUMBER=" + IMarker.LINE_NUMBER); //$NON-NLS-1$
-		try {
-			Map attrs = marker.getAttributes();
-			Iterator iter = attrs.entrySet().iterator();
-			while (iter.hasNext()) {
-				Map.Entry e = (Map.Entry) iter.next();
-				System.out.println("   " + e.getKey() + " " + e.getValue()); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-
-		} catch (CoreException e) {
-			e.printStackTrace();
-		}
-
-	}
-
-	public ImageDescriptor makeImageDescriptor(String iconName) {
-		URL url = thePlugin_.find(new Path(iconName));
-		ImageDescriptor id = ImageDescriptor.createFromURL(url);
-		return id;
-	}
-
-	/**
-	 * Push change info (artifact and marker) onto a stack so we can remember
-	 * it, for possible undo action. Also enables/disables the Undo action
-	 * button.
-	 * 
-	 * @param artifact
-	 * @param marker
-	 */
-	protected void pushChangedInfo(IArtifact artifact, IMarker marker) {
-		changedArts_.push(artifact);
-		changedMarkers_.push(marker);
-		checkUndoStatus();
-	}
-
-	/**
-	 * Set status of undo action (enabled or disabled) based on if there are any
-	 * artifact changes, or other changes, available to undo
-	 * 
-	 */
-	protected void checkUndoStatus() {
-
-	}
-
-	/**
-	 * Get marker line numbers.
-	 * 
-	 * @param marker
-	 * @return
-	 */
-	protected int getMarkerLineNo(IMarker marker) {
-		int lineNo = getIntAttr(marker, IMarker.LINE_NUMBER);
-		return lineNo;
-	}
-
-	/**
-	 * Get an int value that is assumed to be stored in a marker in a given
-	 * attribute.
-	 * 
-	 * @param marker
-	 * @param attr
-	 *            the attribute name
-	 * 
-	 * @return the int value, or 0 if none found, or invalid value found
-	 */
-	protected int getIntAttr(IMarker marker, String attr) {
-		String temp = null;
-		try {
-			temp = marker.getAttribute(attr).toString();
-		} catch (Exception e) { // CoreException or ClassCastException possible
-			e.printStackTrace();
-			System.out.println("ATV: Marker lineNo(" + attr + ") invalid; using 0"); //$NON-NLS-1$ //$NON-NLS-2$
-			return 0;
-		}
-		int lineNo = 0;
-		try {
-			lineNo = Integer.parseInt(temp);
-		} catch (NumberFormatException nfe) {
-			System.out.println("ATV: Marker lineNo(" + temp + " from attr " + attr //$NON-NLS-1$ //$NON-NLS-2$
-					+ ") invalid (NumberFormatException); using 0"); //$NON-NLS-1$
-		}
-		return lineNo;
-	}
-
-	/**
-	 * convenience method for getting attribute String value.
-	 * 
-	 * @param marker
-	 * @param attr
-	 * @return
-	 */
-	protected String getAttribute(IMarker marker, String attr) {
-		String result = null;
-		try {
-			result = (String) marker.getAttribute(attr);
-		} catch (Exception e) {
-			System.out.println("** Exception getting marker attribute " + e); //$NON-NLS-1$
-			e.printStackTrace();
-		}
-		return result;
-
-	}
-
-	/**
-	 * a Stack that isn't based on Vector - Generic LIFO stack
-	 * 
-	 * @author Beth Tibbitts
-	 * 
-	 * 
-	 */
-	public class StackList {
-		private LinkedList list = new LinkedList();
-
-		public void push(Object v) {
-			list.addFirst(v);
-		}
-
-		public Object top() {
-			return list.getFirst();
-		}
-
-		public Object pop() {
-			return list.removeFirst();
-		}
-
-		public boolean isEmpty() {
-			return list.isEmpty();
-		}
-
-	}
-
-	/**
-	 * Visit the resource delta to look for the marker changes we are interested
-	 * in
-	 * 
-	 * @author Beth Tibbitts
-	 */
-	public class UpdateVisitor implements IResourceDeltaVisitor {
-
-		/**
-		 * Visit appropriate parts of the resource delta to find the markers
-		 * that changed that we care about.
-		 * 
-		 * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
-		 */
-		public boolean visit(IResourceDelta delta) throws CoreException {
-			IResource resource = delta.getResource();
-			String name = resource.getName();
-			if (resource.getType() == IResource.FILE) {
-				if (delta.getKind() == IResourceDelta.CHANGED) {
-					if (traceOn)
-						System.out.println("UpdateVisitor: file changed: " + name); //$NON-NLS-1$
-
-					// Handle file changes (saves) by reporting the changes
-					// made to the file, to update backend analysis
-					// representation
-					IFile f = (IFile) resource;
-					int flags = delta.getFlags();
-					int contentChanged = flags & IResourceDelta.CONTENT;
-
-					if (validForAnalysis(f.getName())) {
-						if (traceOn)
-							System.out.println("File " + f.getName() //$NON-NLS-1$
-									+ " is valid for analysis so will process the change..."); //$NON-NLS-1$
-						if (contentChanged != 0) {
-							// do we need to tell back end (analysis engine)
-							// that file changed?
-						}
-
-						// refresh markers for that file?
-						IMarkerDelta[] mDeltas = delta.getMarkerDeltas();
-						int len = mDeltas.length;
-						for (int j = 0; j < len; j++) {
-							IMarkerDelta delta3 = mDeltas[j];
-							if (traceOn)
-								showMarkerDeltaKind(delta3);
-							IMarker m = delta3.getMarker();
-							String ln = IMarker.LINE_NUMBER;
-							if (traceOn)
-								System.out.println("---UpdateVisitor.visit():viewer update marker: (lineNo)"); //$NON-NLS-1$
-							// showMarker(m);
-							String[] props = new String[1]; // awkward. why???
-							props[0] = ln;
-							// just update viewer item, not the whole view
-							// viewer.refresh();
-							viewer.update(m, props);
-						} // end loop
-					} else {
-						if (traceOn)
-							System.out.println("File " + f.getName() //$NON-NLS-1$
-									+ " is NOT valid for analysis so will ignore change..."); //$NON-NLS-1$
-
-					}
-				} // end if CHANGED
-				else if (delta.getKind() == IResourceDelta.ADDED) {
-					//System.out.println("Resource added.");
-					checkMarkerDeltas(delta);
-				} else if (delta.getKind() == IResourceDelta.REPLACED) {
-					//System.out.println("Resource replaced.");
-					checkMarkerDeltas(delta);
-				} else if (delta.getKind() == IResourceDelta.REMOVED) {
-					//System.out.println("Resource removed.");
-					checkMarkerDeltas(delta);
-				}
-			} // end if FILE
-			return true; // keep going
-		}
-
-		private void checkMarkerDeltas(IResourceDelta delta) {
-			IMarkerDelta[] md1 = delta.getMarkerDeltas();
-			int len = md1.length;
-			//System.out.println("       ... found " + len + " markerDeltas.");
-		}
-
-		/**
-		 * Show info about the marker in the marker delta. This is just tracing
-		 * the info available until we do something with it. For now, we're just
-		 * doing a (big) viewer.refresh() to refresh all the markers. When we
-		 * get more intelligent about just updating the ones that changed, we
-		 * can remove that. Shouldn't make much different for small sets of
-		 * markers, but for many markers, this could be a significant
-		 * performance improvement.
-		 * 
-		 * @param delta3
-		 */
-		private void showMarkerDeltaKind(IMarkerDelta delta3) {
-
-			// int mdKind = delta3.getKind();
-			IMarker m = delta3.getMarker();
-
-			String kind = "UNKNOWN"; //$NON-NLS-1$
-			switch (delta3.getKind()) {
-			case IResourceDelta.ADDED:
-				kind = "ADDED"; //$NON-NLS-1$
-				break;
-			case IResourceDelta.CHANGED:
-				kind = "CHANGED"; //$NON-NLS-1$
-				break;
-			case IResourceDelta.REMOVED:
-				kind = "REMOVED"; //$NON-NLS-1$
-				break;
-			default:
-				kind = "UNKNOWN"; //$NON-NLS-1$
-				break;
-			}
-
-			if (traceOn)
-				System.out.println("    markerDeltaKind=" + kind); //$NON-NLS-1$
-			String mid = "", ml = "", mlpi = ""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			try {
-				// note: we're getting marker deltas on ALL markers,
-				// not just artifact markers, which can throw us off.
-				// in particular, temp markers used by actions?
-
-				mid = m.getAttribute(uniqueID_).toString();
-				ml = m.getAttribute(IMarker.LINE_NUMBER).toString();
-				// mlpi = m.getAttribute(IDs.LINE).toString();
-			} catch (Exception e1) {
-				// ignore errors; only tracing for now.
-				System.out.println("ATV.UpdateVisitor error getting marker info "); //$NON-NLS-1$
-				e1.printStackTrace();
-			}
-			if (traceOn)
-				System.out.println("    markerID_=" + mid + "  lineNo(mkr-mpiA)=" + ml + "-" + mlpi); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		}
-
-	} // end class UpdateVisitor
-
-}
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/.classpath b/tools/pldt/org.eclipse.ptp.pldt.doc.user/.classpath
deleted file mode 100644
index c835067..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/.classpath
+++ /dev/null

@@ -1,6 +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="output" path="bin"/>
-</classpath>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.doc.user/.cvsignore
deleted file mode 100644
index 6cc813f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-bin
-@dot
-javaCompiler...args

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/.project b/tools/pldt/org.eclipse.ptp.pldt.doc.user/.project
deleted file mode 100644
index 08003cf..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.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>
-		<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.doc.user/.settings/org.eclipse.jdt.core.prefs b/tools/pldt/org.eclipse.ptp.pldt.doc.user/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index eea098b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,8 +0,0 @@
-#Fri Apr 16 12:49:29 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.doc.user/META-INF/MANIFEST.MF b/tools/pldt/org.eclipse.ptp.pldt.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index 6362147..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/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.pldt.doc.user;singleton:=true
-Bundle-Version: 4.0.0.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.help
-Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/about.html b/tools/pldt/org.eclipse.ptp.pldt.doc.user/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.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/tools/pldt/org.eclipse.ptp.pldt.doc.user/build.properties b/tools/pldt/org.eclipse.ptp.pldt.doc.user/build.properties
deleted file mode 100644
index 9ccb8a3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/build.properties
+++ /dev/null

@@ -1,10 +0,0 @@
-bin.includes = plugin.xml,\
-               html/,\
-               toc.xml,\
-               .,\
-               META-INF/,\
-               intro/,\
-               plugin.properties,\
-               about.html,\
-               icons/
-bin.excludes = html/imagesOld/

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/barrier.html b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/barrier.html
deleted file mode 100644
index dbd0e8d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/barrier.html
+++ /dev/null

@@ -1,256 +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>MPI Barrier Analysis</title>
-	<link rel="stylesheet" type="text/css" href="help.css">
-	<script type="text/javascript" src="thumb.js"> </script>
-</head>
-
-<body>
-<h1><img src="images/barrier.gif"> PLDT MPI Barrier Analysis</h1>
-<h2><img src="images/barrier.gif"> Overview of PLDT MPI Barrier Analysis</h2>
-<p>MPI Barrier Analysis detects potential deadlocks in MPI applications,
-and shows barrier matches, barrier errors, and paths of all barrier
-matching sets.  Includes detections across multiple functions and source files.
-<br><img src="images/barrierMatches.gif">
-<br>&nbsp;
-<br><img src="images/barrierErrors.gif">
-<br>&nbsp;
-
-<h2><img src="images/barrier.gif"> Barrier Analysis: A Short Introduction</h2>
-<p>A common source of errors in SPMD (Single Program Multiple Data) programming causes deadlocks when barrier
-statements, in which all tasks must synchronize, are not matched properly.
-If one MPI task in a communicator does not pass through the same number of MPI_Barrier statements as the
-other tasks in the same communicator,
-the other tasks will deadlock while waiting.
-
-<p>
-The PLDT MPI Barrier analysis checks an SPMD program and determines whether there are deadlocks
-due to the misplacement of barriers. We will report errors if any, and show "matching sets" 
-for each barrier if error-free. The matching set of a barrier contains all barriers that
-synchronize with it at run time. 
-
-<p>For example, consider the second if-branch in 
-<a href="samples/testMPIbarrier.c">testMPIbarrier.c</a>. 
-<pre>
-	if(my_rank == 0){
-		printf("test errors\n");
-		MPI_Barrier(MPI_COMM_WORLD);
-	}
-
-</pre>
-The program will become deadlocked on the above branch because some processors
-will execute the global barrier in the branch while the others will skip it. 
-However,
-it is difficult to visually detect an error if barriers are not "textually" aligned. 
-<p>
-Now, consider the
-third if-branch in <a href="samples/testMPIbarrier.c">testMPIbarrier.c</a>. 
-<pre>
-	if(x < 3){
-		printf("It is not an error\n");
-		MPI_Barrier(MPI_COMM_WORLD);
-	}
-
-</pre>
-Even if we only have a barrier in the then clause but
-not in the else clause, there is no error since all processors agree on the branch
-predicate, and they will choose the same way to go.
-<h2>Running Barrier Analysis</h2>
-<p>To run the barrier analysis, select a project, container, or source file in the Project Explorer view, 
-and click the  MPI barrier analysis action in the PLDT icon menu. 
-Note that this simple example has all code in a single file, but by running the analysis on a 
-container (folder) or the entire project, inter-procedural barriers from other included files are also considered.
-<br><script> thumb("images/barrierActionAnn.gif",300)</script>
-<p>The barrier analysis produces three views of information:
-<ul>
-<li><a href="#barView">MPI Barriers View</a></li>
-<li><a href="#barMatch">Barrier Matches View</a></li>
-<li><a href="#barError">Barrier Errors View</a></li>
-</ul>
-<p>The three views should show automatically after performing barrier analysis,
-but to bring them up otherwise, select Window > Show View > Other... and under
-<b>PTP MPI Views</b>, select the view you want to show.
-
-<h2 id="barView">MPI Barriers View </h2>
-<p>The <b>MPI Barriers</b> view lists all barriers in the program(s), their
-enclosing function names, filenames, line numbers, and index numbers 
-(beginning from 1). In the other two views, barriers are referred to according to
-their index numbers (e.g., the barrier with index number 1 is called 
-"barrier 1").
-<p>To find the source code line for a barrier in the view, double-click on the line
-in the view, and the editor will open on that source file (if not already opened) and
-it will scroll to the line containing the barrier.</p>
-<p> 
-<img src="images/BarrierView.gif">
-<br>
-<h2 id="barMatch">Barrier Matches View </h2>
-<p>By running the analysis, we will show two kinds
-of results: 
-
-<ol>
-<li>
-For each barrier b, all barriers that match to b are shown. </li>
-<li>
-Barrier synchronization errors are shown, if any. </li>
-</ol>
-<p>The matching sets are shown in the <b>Barrier Matches</b> view. 
-They are grouped in this view as a tree view with "parent" nodes and "child" nodes.
-The matching set of a barrier contains all barriers that
-synchronize with it at run time. That is, all processes in the MPI program must arrive
-at one of the barrier statements in a matching set, before any of the processes can proceed.
-For each barrier statement in the program source files that are analyzed, a matching set is calculated and shown.  
-So for a matching set
-with two members, this view will show both a matching set with the first barrier as the parent,
-and another matching set with the second barrier as the parent.
-The parent barrier node in the view shows the size of its matching set in parentheses.
-<p>
-Note that if a matching error occurs in a statement,  
-then barriers used in this statement <i>might</i> have an empty matching set (they <i>might</i>
-still have a non-empty matching set if they are also used in other portions of the
-program). This is one of the advantages of our analysis: if an error occurs, our
-analysis can "recover" from such an error by continuing to analyze other portions of 
-the program that are not affected by such error.
-</p>
-<p>In the following example, the matching set for "Barrier 1" 
-(the barrier set highlight in blue below) contains two (2) barriers.
-The first is in the <code>barrier()</code> function and the second is in the 
-<code>main()</code> function.
-</p>
-<p>Like the other views, to find a barrier source code line from the view, double-click on the
-line in the view.  Barrier markers are shown in the marker bar of the editor to pinpoint the
-barrier statements found.
-
-<p>
-<img src="images/BarrierMatchingSetView.gif">
-
-<h2 id="barError">Barrier Errors View </h2>
-<p>When a barrier error is detected, it is shown in the <b>Barrier Errors</b> view.
-Double-click on the <b>Error</b> line to highlight the error line in the source code.
-In addition, the Barrier Errors view shows a counter example which contains 
-two sequences of barriers which have different sizes along two
-paths starting from the highlighted error position. This counter example
-simulates an execution and illustrates the reason for the 
-synchronization error. Note that a synchronization error occurs if different 
-MPI tasks meet a different number of barriers.  If a barrier b is in a loop, and
-all tasks execute the same number of iterations, then barrier b is marked by 
-"*", which means that the static barrier in the counter example represents a 
-dynamic number of barriers at runtime. If a synchronization error occurs 
-on a loop (i.e., different tasks will execute a different number of iterations 
-of such loop), then we show the counter example as the sequence of barriers
-in the loop body. 
-<br><script> thumb("images/barrierErrorView.gif",300)</script>
-<p>If a filename and LineNo are shown, double-click on that line in
-the Barrier Errors view to locate that Barrier or error.
-The initial Error line in the view should point to the point in the path of
-execution that forks (such as an if statement) such that one path encounters 
-a barrier that the other path does not.
-<p>
-To show the path of a counterexample (e.g. a path without barriers),
-double-click on the Path line in the view, as shown below. If there
-is a path available it should be shown.
-<br><script> thumb("images/barrierPathSelection.png",350)</script>
-
-
-<h3>Sample program testMPIbarrier.c </h3>
-<p> We use this simple program <a href="samples/testMPIbarrier.c">testMPIbarrier.c</a> 
-to illustrate the basic functionality of the
-analysis and three views. 
-The code is condensed here:
-<pre>
-    if (my_rank !=0){
-		...
-		MPI_Send(...);
-		MPI_Barrier(MPI_COMM_WORLD);
-	}
-	else{
-		for (source = 1; source < p; source++) {
-			MPI_Recv(...);
-		}
-		barrier();
-	}
-	if(my_rank == 0){
-		MPI_Barrier(MPI_COMM_WORLD);
-	}
-	else{
-	    printf("this path does not contain a barrier\n");
-	}
-	
-	if(x < 3){
-		...
-		MPI_Barrier(MPI_COMM_WORLD);
-	}
-	
-	while(x < my_rank){
-		MPI_Barrier(MPI_COMM_WORLD);
-		x ++;
-	}
-</pre>
-There are three branches and one loop in the program.
-The first branch ( the <code>if( my_rank!=0)</code> statement ) is free of synchronization 
-errors; two barriers (one encoded directly in 
-the loop, 
-and the other in the barrier() function called in the else clause) match to each other. 
-The second branch (<code>if(my_rank == 0)</code>)
-contains an error because some tasks would execute the barrier in it, while the
-other tasks would skip it. The else clause here is added for emphasis.
-The next branch (<code>if(x<3)</code>) does not make a decision based on processor
-rank (x does not depend on rank) so processes should proceed similar to each other.
-The loop (<code>while(x < my_rank)</code>)
-contains an error also, since different 
-tasks may execute a different number of iterations, and thus encounter a different number of
-barriers.
-<h3>Removing Barrier Markers</h3>
-<p>To remove barrier markers, Use the remove markers icon (red X) on the <b>Barrier Matches</b> or
-<b>Barrier Errors</b> view.  This removes all barrier markers.
-<br><img src="images/barrierMarkerRemove.png">
-
- <!-- since this code isn't included, don't refer to it here  
-<h3> MPB </h3>
-<p>MPB is a scientific application which computes the electromagnetic model using
-maxwell equations. We use this example to show the following points:
-<p>(1) Our analysis has inter-procedural analysis. This makes our analysis tool 
-outperform previous intra-procedural analysis algorithms.
-<p>(2) Try this to show the necessity and effectiveness of the inter-procedural 
-analysis. In the original code, there are three barriers: two in function 
-matrixio_create_sub(), and one in matrixio_create_dataset(). Obviously two barriers
-in matrixio_create_sub() match to each other. Now comment out "barrier 1" (the one 
-in the then clause of the if-branch in matrixio_create_sub()), add a barrier in function
-mpi_is_master(), right after the MPI_Comm_rank call, then run the analysis.
-One may expect a synchronization error in this branch, however it is still error free, 
-since the function matrixio_write_string_attr() will call mpi_is_master() somewhere.
-(matrixio_write_string_attr calls  write_attr which calls mpi_is_master)
-
-<h3> Tcgmsg </h3>
-
-Tcgmsg is an MPI toolkit. As with the MPB application, we use it to demonstrate the inter-procedural
-analysis. There are some interesting points in the function test_main():
-
-(1) At the beginning of test_main(), the master thread reads a parameter "opt"
-from stdout (the first while loop), and broadcasts it to other threads 
-(by BRDCST_) so that they obtain the same "opt". All threads then choose 
-some job to do according to the value of "opt". No synchronization occurs in the original
-code. If the master thread doesn't broadcast the "opt" value, then different processors
-will choose different jobs, and an error occurs (no barrier are used in cast 0-4, while
-some barriers are used in case 5).
-
-(2) This program also illustrates how errors (and counter examples) are reported for
-the "switch" statement. Briefly, we will only show the "first" error, i.e., if
-the switch statement contains n cases, we will always begin from the first two cases, 
-and move to the next case ONLY IF the first two cases are error-free. To test it, if
-we add a barrier in case 0 clause, then an error will be reported, and one path
-in the counter example contains 1 barrier (the barrier we've just added in), and the
-other path contains no barrier (case 1 clause).
--->
-
-<p>&nbsp;
-<p>&nbsp;
-<p>&nbsp;
-
-<p><a href="toc.html">Back to PLDT Help Table of Contents</a>
-<p>&nbsp;
-<p>&nbsp;
-</body>
-</html>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/help.css b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/help.css
deleted file mode 100644
index f34a23d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.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/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/BarrierMatchingSetView.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/BarrierMatchingSetView.gif
deleted file mode 100644
index 92cd936..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/BarrierMatchingSetView.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/BarrierView.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/BarrierView.gif
deleted file mode 100644
index aeb240c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/BarrierView.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/analyze.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/analyze.gif
deleted file mode 100644
index 2b4542a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/analyze.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrier.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrier.gif
deleted file mode 100644
index 75a9760..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrier.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierActionAnn.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierActionAnn.gif
deleted file mode 100644
index 5453201..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierActionAnn.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierErrorView.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierErrorView.gif
deleted file mode 100644
index 0a7b8f0..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierErrorView.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierErrors.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierErrors.gif
deleted file mode 100644
index a849c0c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierErrors.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierMarkerRemove.png b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierMarkerRemove.png
deleted file mode 100644
index 0b8a77c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierMarkerRemove.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierMatches.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierMatches.gif
deleted file mode 100644
index 29de46c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierMatches.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierPathSelection.png b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierPathSelection.png
deleted file mode 100644
index 206d3c9..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierPathSelection.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/cdtPrefsTemplates.png b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/cdtPrefsTemplates.png
deleted file mode 100644
index 7b4f53e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/cdtPrefsTemplates.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/clearMarkers.png b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/clearMarkers.png
deleted file mode 100644
index b7ded55..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/clearMarkers.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/contentAssist.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/contentAssist.gif
deleted file mode 100644
index 109d3fe..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/contentAssist.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/helpContSens.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/helpContSens.gif
deleted file mode 100644
index d105b48..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/helpContSens.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/helpContSensHitF1.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/helpContSensHitF1.gif
deleted file mode 100644
index b9ca9ab..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/helpContSensHitF1.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/helpContSensHitF1click.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/helpContSensHitF1click.gif
deleted file mode 100644
index 0bc78fe..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/helpContSensHitF1click.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/hover.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/hover.gif
deleted file mode 100644
index 1ede3c6..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/hover.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/include.png b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/include.png
deleted file mode 100644
index de8967b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/include.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/lib.png b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/lib.png
deleted file mode 100644
index e6f3dde..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/lib.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/makefileProjProps.png b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/makefileProjProps.png
deleted file mode 100644
index dc75fdd..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/makefileProjProps.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/makefileProject.png b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/makefileProject.png
deleted file mode 100644
index 17c0423..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/makefileProject.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/menuShowOpenMPartifacts.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/menuShowOpenMPartifacts.gif
deleted file mode 100644
index c9ba03b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/menuShowOpenMPartifacts.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/menuShowUPCartifacts.png b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/menuShowUPCartifacts.png
deleted file mode 100644
index bc4f49a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/menuShowUPCartifacts.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiBuildCommand.png b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiBuildCommand.png
deleted file mode 100644
index 5b4d823..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiBuildCommand.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiButtons.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiButtons.gif
deleted file mode 100644
index e5aa0e5..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiButtons.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiMenu.png b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiMenu.png
deleted file mode 100644
index 6b2eea1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiMenu.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiNewProjectWorkbench.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiNewProjectWorkbench.gif
deleted file mode 100644
index 93fefe9..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiNewProjectWorkbench.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiPrefsHaveNotBeenSet.png b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiPrefsHaveNotBeenSet.png
deleted file mode 100644
index a4fd416..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiPrefsHaveNotBeenSet.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiTemplates.png b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiTemplates.png
deleted file mode 100644
index 60ba6d5..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiTemplates.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiTemplatesMod.png b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiTemplatesMod.png
deleted file mode 100644
index b7126da..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiTemplatesMod.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiViewAnn.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiViewAnn.gif
deleted file mode 100644
index 33ee9d4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiViewAnn.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiWizard.png b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiWizard.png
deleted file mode 100644
index 0b95bbe..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiWizard.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiWizard2.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiWizard2.gif
deleted file mode 100644
index 78236de..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiWizard2.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiWizard3.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiWizard3.gif
deleted file mode 100644
index 69eef08..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiWizard3.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/newProjOpenMP.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/newProjOpenMP.gif
deleted file mode 100644
index 1870fac..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/newProjOpenMP.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/newProjOpenMPsettings.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/newProjOpenMPsettings.gif
deleted file mode 100644
index 6b260b7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/newProjOpenMPsettings.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/ompCompilerOpt.png b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/ompCompilerOpt.png
deleted file mode 100644
index db510ff..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/ompCompilerOpt.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/openmpArtifactsfound.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/openmpArtifactsfound.gif
deleted file mode 100644
index c84bbe2..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/openmpArtifactsfound.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/openmpPrefs.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/openmpPrefs.gif
deleted file mode 100644
index b1999b6..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/openmpPrefs.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/pldt-menu.png b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/pldt-menu.png
deleted file mode 100644
index 31063ed..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/pldt-menu.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/pldt-prefs1.png b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/pldt-prefs1.png
deleted file mode 100644
index 013098b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/pldt-prefs1.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/pldtIconMisplaced.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/pldtIconMisplaced.gif
deleted file mode 100644
index 99a655b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/pldtIconMisplaced.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/ptp-openMPpragmaAnn.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/ptp-openMPpragmaAnn.gif
deleted file mode 100644
index 35dd057..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/ptp-openMPpragmaAnn.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/ptp-openMPproblems.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/ptp-openMPproblems.gif
deleted file mode 100644
index 9817caa..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/ptp-openMPproblems.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/ptp-openMPshowConcurrency.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/ptp-openMPshowConcurrency.gif
deleted file mode 100644
index 81c0133..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/ptp-openMPshowConcurrency.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/ptp-openMPshowConcurrencymenu.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/ptp-openMPshowConcurrencymenu.gif
deleted file mode 100644
index 0e16c80..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/ptp-openMPshowConcurrencymenu.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upcArtifacts.png b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upcArtifacts.png
deleted file mode 100644
index 6154c7f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upcArtifacts.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upcPrefs.png b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upcPrefs.png
deleted file mode 100644
index 797074c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upcPrefs.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upcProperties.png b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upcProperties.png
deleted file mode 100644
index 22b4a07..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upcProperties.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upcWizards.png b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upcWizards.png
deleted file mode 100644
index 7adece5..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upcWizards.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upc_editorAndArtifacts.png b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upc_editorAndArtifacts.png
deleted file mode 100644
index 3f8ba8c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upc_editorAndArtifacts.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upc_editorVsArtifacts.png b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upc_editorVsArtifacts.png
deleted file mode 100644
index 085200d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upc_editorVsArtifacts.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upc_template1.png b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upc_template1.png
deleted file mode 100644
index c45fe3f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upc_template1.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upc_template2.png b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upc_template2.png
deleted file mode 100644
index a714df1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/upc_template2.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/welcomeC-pldt.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/welcomeC-pldt.gif
deleted file mode 100644
index cd27dcd..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/welcomeC-pldt.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/welcomeOverview.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/welcomeOverview.gif
deleted file mode 100644
index fbf7309..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/welcomeOverview.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/mpiTemplates.html b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/mpiTemplates.html
deleted file mode 100644
index d996300..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/mpiTemplates.html
+++ /dev/null

@@ -1,50 +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>MPI Templates</title>
-	<link rel="stylesheet" type="text/css" href="help.css">
-	<script type="text/javascript" src="thumb.js"> </script>
-</head>
-<body>
-
-<h1 id="top"> <img src="images/analyze.gif"> MPI  Templates</h1>
-<p>To ease with common patterns of MPI programming, code templates are provided for
-a small number of patterns.  More can be easily added.
-<p>This allows quick entry of common patterns in MPI programming.
-<p>For example, for MPI send-receive,
-<ul>
-<li>Edit a C source code file in the CDT editor.
-<li>Enter:  <code>mpisr</code> and hit Ctrl-space
-<br>Note: On Mac, you may need to hit Ctrl-space twice.
-</li>
-<li>Select the template you want (mpisr is probably the only one) and hit Enter. This expands to the following:
-
-<p><img src="images/mpiTemplates.png">
-</ul>
-<p>Type over any of the included sample variable names, and all occurrences of that name within the template code will
-be changed accordingly.
-<p>One other pattern is also included.  Type  <code>mpiif</code> and hit Ctrl-space
-to see initialize and finalize API calls.
-<p>To see the code templates, and add your own:
-<ul>
-<li>Bring up Eclipse preferences (Windows/Linux: Window > Preferences;  Mac:  Eclipse > Preferences)
-<li>Open C/C++, Editor, Templates
-</li>
-<lp>
-<img src="images/mpiTemplatesMod.png"></lp>
-<li>The sample for MPI Send Receive is shown.  You can add your own or modify any you like.
-
-</ul>
-
-<p>If you have ideas for more MPI (or other) templates, please consider contributing these to PTP!
-Send email to ptp-dev@eclipse.org (<a href="https://dev.eclipse.org/mailman/listinfo/ptp-dev">Developer mailing list</a>).  
-<p>See also <a href="upc.html#templates">UPC Code Templates</a>.
-
-<p>&nbsp;
-<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>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/openMPextra.html b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/openMPextra.html
deleted file mode 100644
index f4d9676..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/openMPextra.html
+++ /dev/null

@@ -1,80 +0,0 @@
-<html>
-<head>
-<title>
-Running PTP OpenMP Tools Plug-in
-</title>
-	<link rel="stylesheet" type="text/css" href="help.css">
-	<script type="text/javascript" src="thumb.js"> </script>
-	</head>
-<body>
-<h1 id="top"> Running PTP OpenMP Tools </h1>
-<p>For the most part, the OpenMP tools are similar to the MPI
-tools.  See the <a href="setup.html">setup</a> and <a href="run.html">run</a> instructions for the MPI tools to
-see how to configure CDT to find the header files, and compile
-and run.
-<p>You can find OpenMP artifacts, sort the artifacts in the
-OpenMP artifact view, navigate to source code lines,
-use hover help, content assist, and bring up a help view
-on the APIs as well.
-
-<p>The PTP Parallel Language Development Tools do add a few
-specific functions uniquely for OpenMP development:
-<ul>
-<li><a href="#pragma">Show #pragma regions</a></li>
-<li><a href="#concur">Show concurrency</a></li>
-<li><a href="#prob">Show Common OpenMP problems</a></li>
-</ul>
-
-
-
-<h2 id="pragma">Show #pragma regions</h2>
-<p><script> thumb("images/ptp-openMPpragmaAnn.gif",300)</script>
-</p>
-<p>In the example screenshot above, OpenMP analysis has been run
-on the source file and two artifacts were found, one API and
-one #pragma.  
-They are shown in the "OpenMP Artifact View" near the bottom of the screen.
-In the OpenMP artifact view, use the context menu on the #pragma item
-and select "Show pragma region" and the region that the #pragma
-encompasses is selected and shown in grey in the editor.
-
-
-
-<h2 id="concur">Show concurrency</h2>
-<p><img src="images/ptp-openMPshowConcurrencymenu.gif"> 
-<br>Select a statement, e.g. the statement highlighted in grey above.
-Select the context menu on the highlighted statement, and click "Show Concurrency"
-as indicated above.  The results are shown below:
-<p><img src="images/ptp-openMPshowConcurrency.gif"> 
-<p>Above are the screen-shot results of an analysis, perhaps on a not so real, 
-but at least interesting example.  
-After indicating via the context menu the statement upon which
-the "Show Concurrency" action is to be executed,
-other statements will be highlighted in yellow.
-The meaning is the following:
-The gray selected statement is analysed for the following: which 
-statements can execute concurrently to it.  
-The result includes all highlighted statements between the two barriers.  But because of the conditional jump around the lower barrier, execution could also reach the top of the loop - hitting the condition and the loop increment, as well as the first statement in the loop body.  All of those statements are highlighted as well. If correct, this example would usefully point out a bug  - being that the second barrier should be outside that if statement!
-
-
-<h2 id="prob">Show Common OpenMP Problems</h2>
-<p><script> thumb("images/ptp-openMPproblems.gif",300)</script>
-<p>Along with the analysis for finding OpenMP artifacts,
-common problems are also located, and shown in the OpenMP Problems view.
-<p>Types of problems recognized include:
-<!--  problems identified in PASTSemanticCheck.java -->
-<ul>
-<li>Parallel directive dynamically inside another parallel, establishes single thread context</li>
-<li>For directive embedded within critical, ordered, or master extents</li>
-<li>For directive embedded within another parallel for or parallel sections</li>
-<li>Parallel directive dynamically inside another parallel, establishes single thread context</li>
-<li>For directive embedded within another for, sections, or single directive</li>
-<li>Barrier directive not permitted in region extent of for, ordered, sections, single, master, and critical</li>
-<li>Master directive not permitted in dynamic extent of for, sections, or single directives</li>
-<li>Ordered directive not permitted in dynamic extent of critical region</li>
-</ul>
-<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>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/overview.html b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/overview.html
deleted file mode 100644
index 4d54b44..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/overview.html
+++ /dev/null

@@ -1,104 +0,0 @@
-<html>
-<head>
-<title>
-PTP Parallel Language Development Tools 
-</title>
-	<link rel="stylesheet" type="text/css" href="help.css">
-	<script type="text/javascript" src="thumb.js"> </script>
-	</head>
-<body>
-<h1 id="top"> <img src="images/analyze.gif"> PTP Parallel Language Development Tools </h1>
-<p>Release 4.0
-<p>The PTP Parallel Language Development Tools (PLDT) provide
-tools to aid in MPI, OpenMP, UPC Programming and other parallel languages and tools.
-PLDT is part of the <a href="PLUGINS_ROOT/org.eclipse.ptp.doc.user/html/toc.html">Parallel Tools Platform</a>.
-<br>Features of the PLDT include:
-<ul>
-<li>Analysis of C, C++ and Fortran code to determine the location of artifacts (APIs and other appropriate items in code) for the following parallel programming systems:
-<ul>
-<li>MPI
-<li>OpenMP
-<li>LAPI
-<li>UPC
-</ul>
-<li>"Artifact View" indicates locations of Artifacts found
-in source code
-<li>Navigation to source code location of artifacts
-<li>Content assist via Cntl-Space completes API names
-while typing, and fills in arguments too.
-<li>Hover help shows API names, arguments, and descriptions.
-<li>Reference information about APIs via F1 (Cntl-F1 on Linux; Help key on Mac)
-<li>MPI Barrier Analysis detects potential deadlocks in MPI applications,
-and shows barrier matches, barrier errors, and paths of all barrier
-matching sets.  Includes detections across multiple functions and source files.
-<li>OpenMP problems view of common errors, OpenMP "show #pragma region" action,
-OpenMP "Show Concurrency" action.
-
-
-
-<li>CDT "New C Project" wizard includes a  wizard page that can 
-automatically add in the include paths etc. for MPI and OpenMP projects.
-(CDT 7.0 now includes some new project wizards for UPC as well.)
-<li>New project wizard can include sample MPI and OpenMP source files 
-and set up the projects to save time.
-<li>Welcome pages introduce new Eclipse users to PLDT.
-<li>Single-menu UI for PLDT analysis features simplifies the editor toolbar.
-<br><img src="images/pldt-menu.png">
-<br>&nbsp;
-
-</ul>
-See also <a href="whatsnew.html">New and Noteworthy </a> - what's new in PLDT 4.0
-<h2>
-Pre-requisites:
-</h2>
-<p>PLDT 4.0 requires the base Eclipse platform, the CDT, and MPI and/or OpenMP.
-<ul>
-<li><b>Eclipse</b> platform: Version  3.6 (Helios)  
-<li><b>CDT:</b>
-Version 7.0 or later for C/C++ files.  (Wherever CDT is mentioned, Photran projects and files,
-for C/C++, if based on Eclipse 3.6/CDT 7.0 or later, should also work, but not much testing has yet been done.)
-
-<li><b>MPI:</b>
-Get MPI and its header file, a version that runs on
-your system (e.g. OpenMPI for Linux/Mac; MPICH2 for win32).
-(Actually, header file is now optional for MPI artifact identification.  See preferences page.)
-<ul>
-<li>Make sure it's in your path 
-<li>You may need to install it in a directory such that there are no spaces in the path
-(that is, not in 'Program Files' etc.)
-</ul>
-<li><b>OpenMP:</b>
-The PTP PLDT OpenMP tools also  need the OpenMP header file.
-<li><b>UPC:</b>
-Header file is now optional for UPC artifact identification.
-<li><b>LAPI:</b>
-Header file required
-
-</ul>
-<p>Note that <i>running</i> MPI or OpenMP (or UPC, or LAPI) is not really required for the PLDT
-to function and provide analysis and help with parallel development.
-Just the header files are required (in some cases these are now optional) in order to know which "artifacts" should
-be located.
-<p>To run the core part of PTP (Parallel Tools Platform, <a href="http://eclipse.org/ptp">http://eclipse.org/ptp</a>,
-to run and debug parallel programs on the local machine), you need whatever runtime it requires.  Currently 
-(4.0, June 2010) this includes OpenMPI, which is available for Linux and Mac Only, but via PTP Remote Tools and/or RDT (Remote Development Tools),
-other  systems can be accessed remotely, and don't need to be installed on the same machine where Eclipse is installed.
-<p>For PLDT, a runtime system is not required, and PLDT will work (e.g. for development and analysis only) on Windows as well.
-
-<h2>Miscellaneous Topics</h2>
-<h3>Misplaced icon?</h3>
-<p>Note: if, after installing PLDT, the PLDT menu icon is misplaced over on the left side
-of the Eclipse toolbar:
-<br><img src="images/pldtIconMisplaced.gif">
-<br>You can put it in its proper place by selecting Window > Reset Perspective.
-<p>&nbsp;
-<li>Eclipse Welcome page includes pointers to information for PLDT.
-<br><img src="images/welcomeOverview.gif">
-<br><img src="images/welcomeC-pldt.gif">
-<br>&nbsp;
-<h3>Tracing in PLDT</h3>
-<p>Tracing is enabled for some parts of PLDT.  <a href="tracing.html">See tracing instructions for how to turn this on.</a>
-<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/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/run.html b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/run.html
deleted file mode 100644
index 5e4bae6..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/run.html
+++ /dev/null

@@ -1,123 +0,0 @@
-<html>
-<head>
-<title>
-Running the MPI Tools within the Parallel Language Development Tools
-</title>
-	<link rel="stylesheet" type="text/css" href="help.css">
-	<link rel="stylesheet" type="text/css" href="help.css">
-	<script type="text/javascript" src="thumb.js"> </script>
-	</head>
-<body>
-<h1 id="top"> Running the MPI Tools within the Parallel Language Development Tools</h1>
-<p>To run the PTP PLDT MPI Tools, 
-create a project, and set the preferences and include paths as described in
-<a href="setup.html">Setup for PTP MPI Tools</a>.
-
-<p>The Parallel Language Development Tools should work on Standard Make C projects as well, and
-on C++ projects (Standard Make and Managed Make).  The description here is for
-a Managed Make C Project.
-
-<p>Note: the terms "Managed Make" and "Standard Make" projects were more visibly used in CDT 3.1.
-They are still there in CDT 4.0 and later, but the names are usually hidden.  By default a project "New C project"
-will create a makefile for you, and thus is a "Managed Make" project; if you create a "Makefile project"
-then that is what was formerly called a "Standard Make" project.  Confused enough? Good.
-
-
-<ol>
-<li>Within the project, create a C file that includes MPI code. A sample is <a href="samples/testMPI.c">testMPI.c</a> 
-If you used the PLDT new project wizard to create a "Hello World" MPI project, then you probably already have one.
-
-<p>Note: A sample C++ file with MPI calls 
-is <a href="samples/testMPIcpp.cpp">testMPIcpp.cpp</a>.
-<br>A sample C++ file with MPI calls in ordinary C style 
-is <a href="samples/helloMPI_c_style.cpp">helloMPI_c_style.cpp</a>.
-
-
-</ul>
-<p>&nbsp;
-
-
-<li>In the Project Explorer View, select the source file to analyse, to find the MPI artifacts.
-To do this, click on the source file in the Project Explorer on the left to highlight it.
-<p>Click the "Show MPI Artifacts" menu item in the PLDT icon menu  in the tool bar.
-<br> <img src="images/mpiMenu.png">
-<br>(Note: if it complains that a source file is not selected the first time, select it again and retry.)
-<p>The workbench with the selection and menu item is shown below:
-
-<p><script> thumb("images/mpiButtons.gif",300)</script>
-<li>The MPI Artifact View is opened, if it was not present.
-It is populated with MPI artifacts found.
-<p><script> thumb("images/mpiViewAnn.gif",300)</script>
-
-
-<p>If no artifacts are found, check that:
-<ol>
-<li>The MPI preferences page lists the include file for the MPI installation
-that your source code uses.  This list is how the analysis determines what is
-an "MPI artifact."  
-<li>Your project properties have the include path (the same one listed
-in the MPI preferences page) listed.
-Note that the MPI analysis may require this even if 
-the build procedure - such as  a build command like 'mpicc' - 
-implicitly does this include for you during build.
-<li><b>OR</b> assure that the "Recognize artifacts by prefix (MPI_) alone" checkbox is checked in the 
-MPI preferences.
-</ol>
-<p>&nbsp;
-<li>Double click on any line in the MPI Artifact View
-to navigate the editor to that line in the source file.
-<p>&nbsp;
-<li>Hover over the MPI Artifact identified in the source file
-(by blue squiggles) to see additional information about that
-function call, for example. 
-<br><img src="images/hover.gif" border=1>
-<li>Rows in the MPI Artifact View can be sorted by any of the columns.
-Click on the column heading to sort.
-<li>Click the "Clear MPI Artifacts Markers" button (red X)
-in the tool bar <i>of the MPI Artifact View</i> to remove all
-the MPI artifacts.
-<br><img src="images/clearMarkers.png" border=1> 
-<li>You can run the analysis on another file and its markers
-will be added to the view.
-<li>You can run the analysis on more than one file (multiple selection)
-or a container (folder or project), to analyse more than one file at a time.
-Click on a project or a folder, then select the
-"Show MPI Artifacts" action
- to run it on all C source files in that folder.
-<br> <img src="images/mpiMenu.png">
-<p>
-<li><b>Content Assist</b><br>
-Type an incomplete MPI function name e.g. "MPI_Ini"
-and hit Ctrl-Space. The information that is shown
-is populated with CDT completions including argument
-types, but in addition, the PTP-MPI tools also provide
-specific information about actual MPI constant values, etc.
-where appropriate, and a yellow popup with additional 
-textual descriptive information about the function.
-Pick the one you want with the arrow keys or the mouse, to add the API to your source file.
-<br><img src="images/contentAssist.gif" border=1>
-<p>
-<li><b>Context sensitive help</b><br>
-Also, if F1 is pressed when the cursor is within
-a function name, a help view appears which shows additional information.
-(In Linux press Ctrl-F1; in Mac Use Help button or use menu Help > Dynamic Help)
-
-<br><img src="images/helpContSensHitF1.gif" border=1>
-<p>Help View appears:
-<br><img src="images/helpContSens.gif" border=1>
-<p>Click on the function name to see more information:
-<br><img src="images/helpContSensHitF1click.gif" border=1>
-
-</ol>
-<p>&nbsp;
-<p>See also the <a href="barrier.html">MPI Barrier Analysis</a> explanation.
-
-<p>See also <a href="mpiTemplates.html">MPI Code Templates</a>.
-
-<p>See also the <a href="setupOMP.html">OpenMP setup information</a>
-or the <a href="runOMP.html">OpenMP run information</a>.
-<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>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/runOMP.html b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/runOMP.html
deleted file mode 100644
index 6cb660e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/runOMP.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<html>
-<head>
-<title>
-Running PTP OpenMP Tools 
-</title>
-	<link rel="stylesheet" type="text/css" href="help.css">
-	<script type="text/javascript" src="thumb.js"> </script>
-	</head>
-<body>
-<h1 id="top"> Running PTP OpenMP Tools </h1>
-
-<p>The basic instructions for running the OpenMP tools 
-(finding OpenMP artifacts, navigating to source code, using Help)
-are the same
-as for <a href="run.html">running the MPI tools.</a>.
-<p>Finding OpenMP artifacts:
-<br><img src="images/menuShowOpenMPartifacts.gif">
-<p>OpenMP artifacts found and shown in the OpenMP Artifact View:
-<p><script> thumb("images/openmpArtifactsfound.gif",300)</script>
-<p>
-There are a few <a href="openMPextra.html">extra OpenMP analysis functions</a> beyond those available for MPI, too.
-
-
-<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>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/samples/helloMPI_c_style.cpp b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/samples/helloMPI_c_style.cpp
deleted file mode 100644
index dc569dd..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/samples/helloMPI_c_style.cpp
+++ /dev/null

@@ -1,59 +0,0 @@
-#include "mpi.h"
-#include <iostream>
-using namespace std;
-
-// from ews/gridmpi/mpiExample2/src/helloMPI.c
-
-class HelloWorld {
-	public:
-		int sayHello(int argc, char* argv[]);
-};
-
-int HelloWorld::sayHello(int argc, char* argv[]) {
-	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 */
-	
-	cout << "Hello MPI World the original." << endl;
-	
-	/* start up MPI */
-	MPI_Init(&argc, (char***)(&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_INTEGER, source, tag,
-			      MPI_COMM_WORLD, &status);
-			cout << message << endl;
-		}
-	}
-	/* shut down MPI */
-	MPI_Finalize(); 
-	
-	return 0;
-}
-
-int main (int argc, char* argv[]) {
-  HelloWorld hello;
-  hello.sayHello(argc, argv);
-  return 0;
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/samples/pi.cpp b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/samples/pi.cpp
deleted file mode 100644
index a716a24..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/samples/pi.cpp
+++ /dev/null

@@ -1,49 +0,0 @@
-#include <math.h> 
-#include "mpi.h" 
-#include <iostream>
-using namespace std;
- 
- /* 
-  * Calculation of PI in MPI via C++
- */
-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(); 
- 
-    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.doc.user/html/samples/testMPI.c b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/samples/testMPI.c
deleted file mode 100644
index 1abdcd3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/samples/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 World the original.\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.doc.user/html/samples/testMPIbarrier.c b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/samples/testMPIbarrier.c
deleted file mode 100644
index 1bab7f2..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/samples/testMPIbarrier.c
+++ /dev/null

@@ -1,77 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include "mpi.h"
-// Sample MPI program
-
-
-void barrier(){
-	MPI_Barrier(MPI_COMM_WORLD);
-}
-
-int main(int argc, char* argv[]){	
-	int  my_rank; /* rank of process */
-	int  p;       /* number of processes */
-	int source;   /* rank of sender */
-	int dest;     /* rank of receiver */
-	int tag=0, x = 3;    /* 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); 
-	
-	MPI_Barrier(MPI_COMM_WORLD);
-	
-	
-	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);
-		barrier();
-	}
-
-
-	if(my_rank == 0){
-		printf("test errors\n");
-		MPI_Barrier(MPI_COMM_WORLD);
-	}
-	else{
-		printf("this path does not contain a barrier");
-	}
-	
-	if(x < 3){
-		printf("It is not an error\n");
-		MPI_Barrier(MPI_COMM_WORLD);
-	}
-	
-	while(x < my_rank){
-		MPI_Barrier(MPI_COMM_WORLD);
-		x ++;
-	}
-	
-	/* shut down MPI */
-	MPI_Finalize(); 
-
-	return 0;
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/samples/testMPIcpp.cpp b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/samples/testMPIcpp.cpp
deleted file mode 100644
index def18c4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/samples/testMPIcpp.cpp
+++ /dev/null

@@ -1,46 +0,0 @@
-#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(); 
- 
-    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.doc.user/html/setup.html b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/setup.html
deleted file mode 100644
index 8227e03..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/setup.html
+++ /dev/null

@@ -1,149 +0,0 @@
-<html>
-<head>
-<title>
-Setup for MPI Tools within the Parallel Language Development Tools
-</title>
-	<link rel="stylesheet" type="text/css" href="help.css">
-	<script type="text/javascript" src="thumb.js"> </script>
-<body>
-<h1 id="top">Setup for MPI Tools within the Parallel Language Development Tools</h1>
-<h2>Terminology of CDT projects</h2>
-<p>Note: the older versions of CDT (4.0 and earlier)
-refer to a C project in which it manages the makefile as  a "Managed Make Project" or a "Managed Build Project"
-and a project which 
-you supply the makefile is a "Standard Make project."
-<p>The current version of CDT that works with PTP 4.0 is CDT 7.0.
-CDT 5.0 and later refers to a C project in which it manages the makefile as just a "C Project" and a project which 
-you supply the makefile is a <a href="setupMakefileProject.html">"Makefile project."</a>
-<p>Both terminologies are sometimes used in these instructions.
-<h2>Project Setup</h2>
-<p>To use  the PTP Parallel Language Development
-Tools feature for MPI development, you need to 
-<ol>
-<li><a href="#prefs">Specify the MPI include path in preferences</a>, and</li>
-<li><a href="#project">Add the MPI include files etc.  to the build information for each  project.</a>
-</ol>
-
-<h2 id="prefs">Specifying the MPI Include path in Preferences</h2>
-<p>During project creation, you will be prompted if the MPI (or OpenMP) include path hasn't been set up in PLDT Preferences.
-The first time you use the New Project Wizard to create an MPI or OpenMP project, 
-you'll be prompted to set up the preferences to point to the appropriate header files.
-<p>Or, you can set it up ahead of time as specified below.
-<p>To specify the MPI include path, use Window > Preferences. (For Mac, use Eclipse > Preferences)
-Under Parallel Tools, Parallel Language Development Tools, MPI...
-(Note: If you do not have core PTP installed, the "Parallel Language 
-Development Tools" section in the preferences will be in the main list.)
-
-<p>Add the path to MPI include paths  - this tells PLDT what symbols to look
-for in the MPI Artifact view.  You can also specify the default MPI build command.
-These values will make the MPI New Project Wizard page make more
-accurate predictions of settings for new projects.
-<p>There is now an optional checkbox to "Recognize MPI Artifacts by prefix alone" - if this
-is checked, then artifacts will be identified solely on the "MPI_" prefix, which is
-less confusing and error-prone for new users.
-<br><img src="images/pldt-prefs1.png">
-
-<p>The "Prompt to include MPI APIs found in other locations (C only)" indicates whether 
-it will ask you if MPI APIS found elsewhere 
-will be considered as artifacts.  For example, if you point to &lt;install-loc&gt;/include in the MPI include paths here,
-but your source files actually include header files from /usr/local/include, it will prompt you to consider these as well 
-during the analysis.
-This is only valid for C projects, not C++ projects.
-<p>Hit OK to close the Preferences dialog.
-
-
-
-<h2 id="project">Add MPI Include paths to each project</h2>
-<p>The MPI include paths must also be added to each project.
-There are two ways to do this.
-<ol>
-<li><a href="#wizard">Use the PLDT new project wizards</a>, or
-</li>
-<li><a href="#manual">Add the build information manually</a>.
-</ol>
-<h2 id="wizard">Use the PLDT new project wizards</h2>
-<p>Create a new "C project"
-<br>One way is to use the menu: File->New->C project (if you are already in the C/C++ perspective this may be the simplest).
-<br>There are several ways to get to this wizard (including context menu in the Project Explorer view). 
-Enter a project name; under Project types, expand 'executable' and select, e.g. "MPI Hello World C project"
-<br>
-<img src="images/mpiWizard.png">
-<p>Note: if you have not set the MPI Preferences yet, you'll be prompted at this point:
-<br><img src="images/mpiPrefsHaveNotBeenSet.png">
-<p>&nbsp;
-<p>See the above <a href="#prefs">Specify the MPI include path in preferences</a> for how to fill this in.
-<p>After specifying the preferences, or if it wasn't required, select Next to go to the next page of the New Project Wizard.
-
-<br>On the next page, the Basic Settings page of the wizard, fill in any project template values, e.g. your name.
-The name is used in a comment in the file.  The "Hello World Greeting" is used in the sample statement
-in the code that is generated.  The "Source" field indicates the name of the source folder that is generated in the project.
-<br>Then select Next.
-<br><img src="images/mpiWizard2.gif">
-<p>On the next page, "MPI Project Settings" page,  the "Add MPI project settings to this project" should be checked.
-If you want to change any of the default values for this project, you can do so
-here by unchecking the "Use default information" and altering the values.
-The default values were chosen based on your input to the PLDT Preferences above.
-
-<br><img src="images/mpiWizard3.gif">
-<p>Select Finish.
-<p>The project is created and should build automatically.
-The Eclipse workbench is shown below after creating the new "MPI hello world" project.
-The project explorer view on the left shows the project contents.
-The source file is under the 'src' directory; expand this to see it.
-Double-click on the source file name to edit the source file.  The outline view on the
-right shows the outline of the file currently shown in the editor.
-The Console view at the bottom shows the results of the project build.
-
-<br><img src="images/mpiNewProjectWorkbench.gif">
-<p>
-<p><p>Now continue to set up to <a href="run.html">run the MPI tools</a>
-<p>
-<h2 id="manual">Add the Build Information Manually</h2>
-<p>If the new project wizard isn't used as described 
-above to set the MPI information for a project,
-the MPI information can be added to the project manually as follows.
-<ol>
-<li>Create a C project 
-<ul>
-
-<li>Note: the following description is for a regular C project (also known as a "Managed Build" CDT project).
-For information about Makefile projects, in which you provide the makefile yourself, 
-see <a href="setupMakefileProject.html">Setup for Makefile projects</a>.
-</li>
-</ul>
-<li>Set up the include paths etc:
-<br>To bring up the Project Properties, rightMouse on the project name, and select "Properties" (at the bottom of the context menu list)
-<br>Project Properties, C/C++ Build, Configuration Settings,
-Tool Settings tab, Directories
-<br>--> Add include path for mpi header files etc. - path to the 'include' dir
-<br><img src="images/include.png">
-<p>&nbsp;
-<p>
-Project Properties, C/C++ Build, Configuration Settings,
-Tool Settings tab, GCC C Linker, Libraries
-<ol>
-<li>Under "Libraries (-l)"  add the symbol "mpi"  
-<li> Under "Library search path (-L)" add the path to the 'lib' dir in MPI dir.
-<br><img src="images/lib.png">
-<p>&nbsp;
-<li><b>MPI Build Command:</b> Note: If you have an MPI installed that requires a different
-build command, such as 'mpicc' instead of 'gcc', specify it here as well.
-Select the compiler tool on the left and modify the 'Command:' value.
-You probably also need to do the same for the linker tool.
-<br><img src="images/mpiBuildCommand.png">
-</ol>
-<p>
-
-</ol>
-<p>Note that the above instructions describe how to add information to C projects in which the makefile is generated for you,
-previously known as "Managed Build" projects.  If you provide your own makefile, you will create a "Makefile project"
-and create the makefile within that project.
-See <a href="makefileSetup.html">Setting up project properties for a Makefile project</a>.
-<p>Now continue to set up to <a href="run.html">run the MPI tools</a>
-
-<p>&nbsp;
-<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>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/setupMakefileProject.html b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/setupMakefileProject.html
deleted file mode 100644
index 77bffad..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/setupMakefileProject.html
+++ /dev/null

@@ -1,32 +0,0 @@
-<html>
-<head>
-<title>
-PLDT setup for Makefile projects
-</title>
-	<link rel="stylesheet" type="text/css" href="help.css">
-	<script type="text/javascript" src="thumb.js"> </script>
-</head>
-<body>
-<h1 id="top">PLDT setup for Makefile projects</h1>
-<h2>Makefile vs. C projects</h2>
-<p>When you use the CDT new project wizards,
-you will see several types of projects.
-A regular "C Project," for example, will create and manage the makefile and building for you.
-This is sometimes called a "Managed Build" Project.
-<p>If you want to provide your own makefile, you will create a "Makefile project"
-and create the makefile within that project.
-<p><img src="images/makefileProject.png">
-<p>For a Makefile project, the Project Properties look a bit different.
-To bring up the project properties dialog, rightMouse on the project in the Project Explorer view,
-and choose "Properties" at the bottom of the context menu.
-<p>&nbsp;
-<p><img src="images/makefileProjProps.png">
-<p>Set up the includes to point to your MPI (or OpenMP, or UPC, or LAPI) include path.
-<p>You set up the PLDT preferences the same way as for regular C (Managed Build) projects.
-
-<p>&nbsp;
-<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>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/setupOMP.html b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/setupOMP.html
deleted file mode 100644
index b8af7c9..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/setupOMP.html
+++ /dev/null

@@ -1,42 +0,0 @@
-<html>
-<head>
-<title>
-Setup for PTP PLDT OpenMP Tools
-</title>
-</head>
-	<link rel="stylesheet" type="text/css" href="help.css">
-	<script type="text/javascript" src="thumb.js"> </script>
-<body>
-
-<h1 id="top"> Setup for PTP OpenMP Tools </h1>
-
-<p>The basic setup for the OpenMP tools is the same
-as for the <a href="setup.html">MPI tools setup</a>.
-Essentially, point CDT at the header files and at the command
-to call your compiler with the OpenMP information.
-<p>The OpenMP preferences should be set to point to your OpenMP header file.
-If you don't set this up prior to using the New Project Wizard to make an
-OpenMP project, you will be prompted to do so at that time.
-<br><img src="images/openmpPrefs.gif">
-<p>The PLDT new project wizards now contain wizards for creating OpenMP projects as well.
-<br><img src="images/newProjOpenMP.gif">
-<p>Be sure on the project settings page that everything is filled in, including the build command.
-Most of these values are calculated based on your entries in the PLDT preferences pages.
-<br><img src="images/newProjOpenMPsettings.gif">
-
-
-
-<br>You may need to manually alter the project build properties (in the project properties) to add compiler flags
-(specific to your OpenMP compiler) to your project.
-Check the settings in your project, they may not match the information shown here.
-<br><img src="images/ompCompilerOpt.png">
-<p>You probably need to do this for the Linker as well as the Compiler option.
-
-<p>&nbsp;
-<p>Now set up to <a href="runOMP.html">run the OpenMP features</a>.
-<p>&nbsp;
-<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>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/thumb.js b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/thumb.js
deleted file mode 100644
index 09c27ec..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.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/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/toc.html b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/toc.html
deleted file mode 100644
index e26014e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/toc.html
+++ /dev/null

@@ -1,53 +0,0 @@
-<html>
-<head>
-<title>
-PTP Parallel Language Development Tools 
-</title>
-	<link rel="stylesheet" type="text/css" href="help.css">
-	<script type="text/javascript" src="thumb.js"> </script>
-	</head>
-<body>
-<h1 id="top"> <img src="images/analyze.gif"> PTP Parallel Language Development Tools </h1>
-<p>Release 4.0
-
-<h2>Help Topics</h2>
-<a href="overview.html">PLDT Overview, pre-requisites, etc.</a>
-<p><a href="http://wiki.eclipse.org/PTP/release_notes/4.0">Basic instructions on installing Eclipse, CDT, PTP, and PLDT</a>
-from the Eclipse PTP web site.
-<p>The following instructions describe setup and run information.
-<h3>MPI</h3>
-<ul><li>
-<a href="setup.html">Setup for building and running PTP MPI Tools</a>
-</li>
-<li>
-<a href="run.html">Running PTP MPI Tools</a></li>
-<li><a href="barrier.html">MPI Barrier Analysis</a></li>
-<li><a href="mpiTemplates.html">MPI Templates</a></li>
-</ul>
-<p>
-<h3>OpenMP</h3>
-<ul><li>
-<a href="setupOMP.html">Setup for building and running PTP OpenMP Tools</a>
-</li>
-<li>
-<a href="runOMP.html">Running PTP OpenMP Tools</a></li>
-<li>
-<a href="openMPextra.html">Additional OpenMP Tools </a>
-</li>
-</ul>
-<h3>UPC</h3>
-<ul>
-<li>
-<a href="upc.html">Setting up and Running UPC Tools</a></li>
-<li><a href="upc_wizards.html">UPC new project wizards and toolchains</a>
-</li>
-</li>
-</ul>
-<h3>Makefile vs. Managed Build projects</h3>
-<ul>
-<li><a href="setupMakefileProject.html">Setting up Makefile projects</a></li>
-</ul>
-<a href="whatsnew.html">New and Noteworthy </a></li> - what's new in PLDT 4.0
-
-</body>
-</html>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/tracing.html b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/tracing.html
deleted file mode 100644
index 637de13..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/tracing.html
+++ /dev/null

@@ -1,34 +0,0 @@
-<html>
-<head>
-<title>
-PTP Parallel Language Development Tools - Tracing
-</title>
-	<link rel="stylesheet" type="text/css" href="help.css">
-	<script type="text/javascript" src="thumb.js"> </script>
-	</head>
-<body>
-<h1 id="top"> <img src="images/analyze.gif"> PLDT Tracing</h1>
-
-<li>Tracing is enabled in PLDT.  To use this:
-<p>
-Create a file ".options" in the same directory as your eclipse executable.
-Put this in the file:
-<pre>
-   org.eclipse.ptp.pldt.common/debug = true
-   org.eclipse.ptp.pldt.common/debug/pldtTrace = true
-</pre>
-Then launch eclipse in debug mode using the -debug option, and mirror the
-Console view output
-to the command line console using the -consoleLog option.  (Maybe Linux already
-spits out the console, not sure.)
-<pre>
-   eclipse -debug -consoleLog
-</pre>
-When you run with this tracing enabled,  it will print out a bunch of
-trace information to the console.  At least MPI artifact analysis
-has been enabled for user-directed tracing.
-<p>&nbsp;
- 
-<p>Back to <a href="toc.html">PLDT Table of Contents</a> page.
-</body>
-</html>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/upc.html b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/upc.html
deleted file mode 100644
index 358d1bb..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/upc.html
+++ /dev/null

@@ -1,99 +0,0 @@
-<html>
-<head>
-<title>
-Running PTP UPC Tools 
-</title>
-	<link rel="stylesheet" type="text/css" href="help.css">
-	<script type="text/javascript" src="thumb.js"> </script>
-	</head>
-<body>
-<h1 id="top"> Running PTP UPC Tools Plug-in</h1>
-
-<p>The basic instructions for running the UPC tools 
-(finding UPC artifacts, navigating to source code, using Help)
-are the same
-as for <a href="run.html">running the MPI tools</a>, but the basics
-and some differences for UPC are noted here.
-
-<p>Note that UPC features are an <i>optional</i> feature of CDT, and are not in the default installation.
-It requires an alternative parser, etc. from the regular CDT C and C++ support.
-See <a href="http://wiki.eclipse.org/PTP/other_tools_setup">UPC tools setup</a> on the PTP wiki
-for how to install CDT optional features for UPC support.
-<p>See also the information on <a href="upc_wizards.html">UPC New Project wizards</a> and toolchains in CDT.
-
-<h2 id="prefs">UPC Preferences</h2>
-<p>Set up UPC Preferences. Here you can specify the UPC include file location.
-This is used for the PLDT analysis feature (not for building).
-It helps to determine whether APIs and other artifacts are related to UPC.
-Alternatively, if you leave the checkbox selected indicating "Recognize APIs by prefix (upc_) alone?"
-then the header file is not used.  This is a much simpler setup and seems less error prone.
-So if the checkbox is checked (which is the default), PLDT does not need the header file to find UPC artifacts.
-It may still ask for it, but won't be used if this is checked.
-
-<br><img src="images/upcPrefs.png">
-<br>&nbsp;
-<h2 id="langmap">Language Mappings</h2>
-
-<p>By default, files of extention ".upc" are considered UPC files.
-See <a href="http://wiki.eclipse.org/PTP/other_tools_setup">UPC tools setup</a> on the PTP wiki
-for how to enable UPC support (parsing, editor highlighting, etc.) on other files including files
-with extensions of .c, .h, etc.
-
-
-
-
-<h2 id="proj">UPC Project Properties</h2>
-<p>Set up UPC project include paths, compiler options, etc. in Project Properties.
-Note that if you use one of the CDT <a href="upc_wizards.html">UPC New Project wizards</a> and toolchains,
-some of this may already be set up for you.
-<br><img src="images/upcProperties.png">
-<br>&nbsp;
-
-<h2 id="art">Finding UPC artifacts</h2>
-<p>Finding UPC artifacts is similar to finding MPI or OpenMP artifacts.
-Select the file (or container: project/folder) to search in the Project Explorer view,
-and Select "Show UPC Artifacts"  from the PLDT menu.
-<br><img src="images/menuShowUPCartifacts.png">
-
-<p>UPC artifacts found and shown in the UPC Artifact View.  Note that "artifacts" are currently defined
-as UPC APIs.  Language features such as upc_forall, upc_barrier, THREADS, etc will not be listed in the
-UPC Artifact View.  Note that they <i>are </i> highlighted with syntax coloring in the editor.
-The UPC Preferences page lets you select you to determine UPC artifacts.  We recommend using the prefix (upc_) to determine
-this, as it is less confusing and less error-prone.
-<p><img src="images/upc_editorAndArtifacts.png">
-<p>Note that currently only UPC APIs (function calls) are identified as artifacts.
-UPC language features are highlighted by CDT.
-<p><img src="images/upc_editorVsArtifacts.png">
-
-<p>&nbsp;
-<h2 id="templates">UPC code templates</h2>
-<p>Some code templates for useful UPC idioms and commonly-used language constructs are included with
-CDT and PTP.
-<p>Note that the optional UPC feature of CDT, as well as the UPC feature of PLDT, must both be installed
-to see and use all the UPC templates.
-<p>To activate code templates, position your cursor where you want to enter the code,
-and press control-space <i>twice.</i>
-You will see a possibly long list of templates to insert.
-To cull the list to just UPC features, type "upc" or "upc_" before hitting control-space (twice).
-The templates that start with the prefix you typed are listed.
-<br><img src="images/upc_template1.png">
-<p>If you choose the highlighted template above, the content will be inserted into your code:
-<br><img src="images/upc_template2.png">
-
-<p>Some variables in the template are replaceable by your own values.  These are highlighted in blue 
-in this example.  Type your variable over these and all instances will be changed to match.
-
-<p>Templates can be easily changed and added to by the user.
-See the Eclipse Preferences, C/C++ > Editor > Templates for more information.
-<br><img src="images/cdtPrefsTemplates.png">
-<p>See also <a href="mpiTemplates.html">MPI Code Templates</a>.
-<br>&nbsp;
-<p>If you have ideas for more UPC (or other) templates, please consider contributing these to PTP!
-Send email to ptp-dev@eclipse.org (<a href="https://dev.eclipse.org/mailman/listinfo/ptp-dev">Developer mailing list</a>).  
-
-
-<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>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/upc_wizards.html b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/upc_wizards.html
deleted file mode 100644
index d38698b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/upc_wizards.html
+++ /dev/null

@@ -1,30 +0,0 @@
-<html>
-<head>
-<title>
-UPC New Project Wizards and Toolchains
-</title>
-	<link rel="stylesheet" type="text/css" href="help.css">
-	<script type="text/javascript" src="thumb.js"> </script>
-	</head>
-<body>
-<h1 id="top"> UPC New Project Wizards and Toolchains</h1>
-
-<p>There are now at least two new project wizards and toolchains for using UPC that are (optional) features of CDT.
-<ul>
-<li>Berkeley UPC
-<li>IBM XLUPC 
-</ul>
-<p>Since these are part of CDT, we only mention them briefly here.
-<p>
-<img src="images/upcWizards.png">
-<p>Be sure the toolchain on the right side of the wizard selection page is used to
-select the correct toolchain for your platform.
-
-
-
-
-<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>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/whatsnew.html b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/whatsnew.html
deleted file mode 100644
index a0eff7b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/whatsnew.html
+++ /dev/null

@@ -1,39 +0,0 @@
-<html>
-<head>
-<title>
-PTP Parallel Language Development Tools 
-</title>
-	<link rel="stylesheet" type="text/css" href="help.css">
-	<script type="text/javascript" src="thumb.js"> </script>
-	</head>
-<body>
-<h1> <img src="images/analyze.gif"> PTP Parallel Language Development Tools (PLDT)<br>
-New and Noteworthy </h1>
-<p>What's new in 4.0
-<ul>
-<li>PLDT supports the changes in CDT 7.0
-<li>Fortran support - PLDT now finds MPI and OpenMP artifacts in Fortran code when the Photran feature is installed.
-<li>UPC code templates for common idioms
-</ul>
-<p>For more information, see the <a href="http://wiki.eclipse.org/PTP">PTP Wiki</a>
-<p>What's new in 3.0
-<ul>
-<li>MPI Artifact recognition does not have to rely on include files matching - preference page has (default) option to recognize
-MPI artifacts by prefix MPI_ only.  This was a frequent problem experienced by new users.
-<li>OpenMP New Project Wizard has improved more basic hello world example, and correctly sets up -fopenmp directive for gcc
-<li>MPI Barrier markers can be removed.
-</ul>
-<p>What's new in 2.1
-<ul>
-<li>Smarter New Project Wizards set up more options, and prompt to set up
-PLDT preferences if needed.
-<li><a href="mpiTemplates.html">MPI Templates</a>
-<li><a href="upc.html">UPC assistance tools</a>
-</ul>
-
-
-</ul>
-<p>&nbsp;
-<p><a href="toc.html">Back to Table of Contents</a>
-</body>
-</html>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/icons/analyze.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/icons/analyze.gif
deleted file mode 100644
index 2b4542a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/icons/analyze.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/css/graphics/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/css/graphics/.cvsignore
deleted file mode 100644
index 085e8ba..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/css/graphics/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-Thumbs.db

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/css/graphics/cdt_icon_create_cproject.png b/tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/css/graphics/cdt_icon_create_cproject.png
deleted file mode 100644
index 1c512d7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/css/graphics/cdt_icon_create_cproject.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/css/graphics/sample.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/css/graphics/sample.gif
deleted file mode 100644
index 5ff1ffc..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/css/graphics/sample.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/css/graphics/sample_hov.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/css/graphics/sample_hov.gif
deleted file mode 100644
index 6874164..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/css/graphics/sample_hov.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/css/sample.css b/tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/css/sample.css
deleted file mode 100644
index ca2a843..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/css/sample.css
+++ /dev/null

@@ -1,3 +0,0 @@
-
-a#orgeclipseptppldtwelcome-introLink img { background-image : url(graphics/sample.gif); }
-a#orgeclipseptppldtwelcome-introLink:hover img { background-image : url(graphics/sample_hov.gif); }
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/pldtOverview.xml b/tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/pldtOverview.xml
deleted file mode 100644
index f982b60..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/pldtOverview.xml
+++ /dev/null

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<introContent>
-  	<extensionContent id="orgeclipseptppldtwelcome-introExtension" style="css/sample.css" 
-  	name="PLDT Welcome Extension" path="overview/@">
-		<group style-id="content-group" id="orgeclipseptppldtwelcome-introLink-group">
-			<link label="Parallel Language Development Tools" id="orgeclipseptppldtwelcome-introLink" style-id="content-link"
-       		   url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.ptp.pldt.doc.user/html/toc.html" >
-       		<text>Learn more about PLDT, to help in developing parallel programs including MPI, OpenMP, and UPC.</text>
-          	</link>
-       	</group>
-  	</extensionContent>
-</introContent>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/pldtTutorial.xml b/tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/pldtTutorial.xml
deleted file mode 100644
index e2ac0d8..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/pldtTutorial.xml
+++ /dev/null

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<introContent>
-  	<extensionContent id="orgeclipseptppldtwelcome-introExtension" style="css/sample.css" name="Sample Extension" path="tutorials/@">
-		<group style-id="content-group" id="orgeclipseptppldtwelcome-introLink-group">
-       		<link label="Parallel Language Development Tools" 
-       		url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.ptp.pldt.doc.user/html/setup.html" 
-       		id="orgeclipseptppldtwelcome-introLink" style-id="content-link">
-          		<text>Learn how to use the development tools for parallel programming in PLDT.</text>
-       		</link>
-       	</group>
-  	</extensionContent>
-</introContent>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/pldtWhatsnew.xml b/tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/pldtWhatsnew.xml
deleted file mode 100644
index eaf6333..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/intro/pldtWhatsnew.xml
+++ /dev/null

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<introContent>
-  	<extensionContent id="orgeclipseptppldtwelcome-introExtension" style="css/sample.css" 
-  	name="PLDT whats new Extension" path="whatsnew/@">
-		<group style-id="content-group" id="orgeclipseptppldtwelcome-introLink-group">
-       		<link label="Parallel Language Development Tools" 
-       		url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.ptp.pldt.doc.user/html/whatsnew.html" 
-       		id="orgeclipseptppldtwelcome-introLink" style-id="content-link">
-          		<text>Find out the new features in PLDT 3.0.</text>
-       		</link>
-       	</group>
-  	</extensionContent>
-</introContent>
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/plugin.properties b/tools/pldt/org.eclipse.ptp.pldt.doc.user/plugin.properties
deleted file mode 100644
index 01a9758..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/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 Parallel Language Development Tools User Guide
-pluginProvider=Eclipse.org
-
-tocIcon.altText = PLDT Help
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/plugin.xml b/tools/pldt/org.eclipse.ptp.pldt.doc.user/plugin.xml
deleted file mode 100644
index f2b0091..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/plugin.xml
+++ /dev/null

@@ -1,37 +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"/>
-            <tocIcon
-                  altText="%tocIcon.altText"
-                  closedIcon="icons/analyze.gif"
-                  id="org.eclipse.ptp.pldt.doc.user.icon"
-                  openIcon="icons/analyze.gif"/>
-   </extension>
-
-  <extension
-         point="org.eclipse.ui.intro.configExtension">
-      <configExtension
-            content="intro/pldtOverview.xml"
-            configId="org.eclipse.ui.intro.universalConfig">
-      </configExtension>
-   
-      <configExtension
-            configId="org.eclipse.ui.intro.universalConfig"
-            content="intro/pldtWhatsnew.xml">
-      </configExtension>
-  
-      <configExtension
-            configId="org.eclipse.ui.intro.universalConfig"
-            content="intro/pldtTutorial.xml">
-      </configExtension>
-   </extension>
-</plugin>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/toc.xml b/tools/pldt/org.eclipse.ptp.pldt.doc.user/toc.xml
deleted file mode 100644
index 768c6ed..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/toc.xml
+++ /dev/null

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Parallel Language Development Tools (PLDT)" link_to="../org.eclipse.ptp.doc.user/toc.xml#ptpPLDT" topic="html/toc.html">
-   <topic href="html/toc.html" label="Contents"/>
-   <topic href="html/overview.html" label="Overview"/>
-      <topic label="Setup for PTP MPI tools"  href="html/setup.html"/> 
-      <topic label="Running PTP MPI tools"  href="html/run.html"/> 
-           <topic label="Setup for PTP OpenMP tools"  href="html/setupOMP.html"/> 
-      <topic label="Running PTP OpenMP tools"  href="html/runOMP.html"/> 
-   <topic href="html/barrier.html" label="MPI Barrier Analysis">
-   </topic> 
-      <topic href="html/upc.html" label="UPC tools"/>
-   <topic href="html/whatsnew.html" label="New and Noteworthy"/>
-
-</toc>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/.classpath b/tools/pldt/org.eclipse.ptp.pldt.lapi/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/.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.lapi/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.lapi/.cvsignore
deleted file mode 100644
index 2cc8dd1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-icons-old

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/.project b/tools/pldt/org.eclipse.ptp.pldt.lapi/.project
deleted file mode 100644
index 598f356..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.lapi</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.lapi/.settings/org.eclipse.jdt.core.prefs b/tools/pldt/org.eclipse.ptp.pldt.lapi/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c2326c1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,8 +0,0 @@
-#Fri Apr 16 12:49:54 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.lapi/META-INF/MANIFEST.MF b/tools/pldt/org.eclipse.ptp.pldt.lapi/META-INF/MANIFEST.MF
deleted file mode 100644
index bdfbf53..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.pldt.lapi; singleton:=true
-Bundle-Version: 4.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.pldt.lapi.LapiPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.cdt.core,
- org.eclipse.cdt.ui,
- org.eclipse.ptp.pldt.common,
- org.eclipse.help,
- org.eclipse.cdt.doc.user
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.ptp.pldt.lapi;
-  uses:="org.eclipse.ptp.pldt.common,
-   org.osgi.framework,
-   org.eclipse.ui.plugin,
-   org.eclipse.osgi.util,
-   org.eclipse.jface.resource",
- org.eclipse.ptp.pldt.lapi.actions

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/about.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/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.lapi/about.ini b/tools/pldt/org.eclipse.ptp.pldt.lapi/about.ini
deleted file mode 100644
index b26762a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/about.ini
+++ /dev/null

@@ -1,27 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/about.mappings b/tools/pldt/org.eclipse.ptp.pldt.lapi/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/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/tools/pldt/org.eclipse.ptp.pldt.lapi/about.properties b/tools/pldt/org.eclipse.ptp.pldt.lapi/about.properties
deleted file mode 100644
index 8ed77ad..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/about.properties
+++ /dev/null

@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-blurb=PTP Parallel Language Development Tools LAPI Support\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-Copyright (c) 2008 IBM Corporation and others.  All rights reserved.\n\
-Visit http://www.eclipse.org/ptp\n
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/build.properties b/tools/pldt/org.eclipse.ptp.pldt.lapi/build.properties
deleted file mode 100644
index a3f816d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/build.properties
+++ /dev/null

@@ -1,13 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               icons/,\
-               html/,\
-               plugin.properties,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               eclipse32.png,\
-               about.html

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/eclipse32.png b/tools/pldt/org.eclipse.ptp.pldt.lapi/eclipse32.png
deleted file mode 100644
index 568fac1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/eclipse32.png
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Addr_get.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Addr_get.html
deleted file mode 100644
index a2ca05e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Addr_get.html
+++ /dev/null

@@ -1,11 +0,0 @@
-<h2 id="laddg">LAPI_Addr_get</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Retrieves
-a function address that was previously registered using <span class="pk">LAPI_Addr_set</span>.  <a id="idx126" name="idx126"></a> <a id="idx127" name="idx127"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Addr_set.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Addr_set.html
deleted file mode 100644
index 20bbfbf..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Addr_set.html
+++ /dev/null

@@ -1,11 +0,0 @@
-<h2 id="ladds">LAPI_Addr_set</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Registers
-the address of a function.  <a id="idx128" name="idx128"></a>  <a id="idx129" name="idx129"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Address.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Address.html
deleted file mode 100644
index a404973..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Address.html
+++ /dev/null

@@ -1,11 +0,0 @@
-<h2 id="addres">LAPI_Address</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Returns an
-unsigned long value for a specified user address.  <a id="idx130" name="idx130"></a> <a id="idx131" name="idx131"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Address_init.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Address_init.html
deleted file mode 100644
index 04751a4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Address_init.html
+++ /dev/null

@@ -1,14 +0,0 @@
-<h2 id="laddsinit">LAPI_Address_init</h2>
- <h4>Purpose</h4>
-<div class="ledi">
-<p>Creates a remote address table.
-</p>
-</div>
-<h4>Library</h4>
-<div class="ledi">
-<p>Availability Library (<span class="pk">liblapi_r.a</span>)</p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Address_init64.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Address_init64.html
deleted file mode 100644
index ac07213..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Address_init64.html
+++ /dev/null

@@ -1,11 +0,0 @@
-<h2 id="addresi64">LAPI_Address_init64</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Creates
-a 64-bit remote address table.  <a id="idx134" name="idx134"></a><a id="idx135" name="idx135"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Amsend.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Amsend.html
deleted file mode 100644
index 6586b9d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Amsend.html
+++ /dev/null

@@ -1,12 +0,0 @@
-<h2 id="amsend">LAPI_Amsend</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Transfers
-a user message to a remote task, obtaining the target address on the remote
-task from a user-specified header handler. <a id="idx136" name="idx136"></a> <a id="idx137" name="idx137"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Amsendv.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Amsendv.html
deleted file mode 100644
index 39cc2a7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Amsendv.html
+++ /dev/null

@@ -1,12 +0,0 @@
-<h2 id="lamsendv">LAPI_Amsendv</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Transfers
-a user vector to a remote task, obtaining the target address on the remote
-task from a user-specified header handler. <a id="idx138" name="idx138"></a> <a id="idx139" name="idx139"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Fence.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Fence.html
deleted file mode 100644
index 3553fc0..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Fence.html
+++ /dev/null

@@ -1,11 +0,0 @@
-<h2 id="lfence">LAPI_Fence</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Enforces order
-on LAPI calls.  <a id="idx140" name="idx140"></a>  <a id="idx141" name="idx141"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Get.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Get.html
deleted file mode 100644
index 87f5945..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Get.html
+++ /dev/null

@@ -1,11 +0,0 @@
-<h2 id="lget">LAPI_Get</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Copies data from
-a remote task to a local task.  <a id="idx142" name="idx142"></a>  <a id="idx143" name="idx143"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Getcntr.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Getcntr.html
deleted file mode 100644
index 008fb79..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Getcntr.html
+++ /dev/null

@@ -1,11 +0,0 @@
-<h2 id="lgetc">LAPI_Getcntr</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Gets the
-integer value of  a specified LAPI counter.   <a id="idx144" name="idx144"></a>  <a id="idx145" name="idx145"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Getv.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Getv.html
deleted file mode 100644
index f20f4fb..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Getv.html
+++ /dev/null

@@ -1,11 +0,0 @@
-<h2 id="lgetv">LAPI_Getv</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Copies vectors
-of data from a remote task to a local task. <a id="idx146" name="idx146"></a>  <a id="idx147" name="idx147"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Gfence.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Gfence.html
deleted file mode 100644
index 93e1545..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Gfence.html
+++ /dev/null

@@ -1,12 +0,0 @@
-<h2 id="lgfence">LAPI_Gfence</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Enforces order
-on LAPI calls across all tasks and provides barrier synchronization among
-them.   <a id="idx148" name="idx148"></a>  <a id="idx149" name="idx149"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Init.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Init.html
deleted file mode 100644
index 1810d8d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Init.html
+++ /dev/null

@@ -1,11 +0,0 @@
-<h2 id="linit">LAPI_Init</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Initializes
-a LAPI context.  <a id="idx150" name="idx150"></a>  <a id="idx151" name="idx151"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Msg_string.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Msg_string.html
deleted file mode 100644
index ffa4d6d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Msg_string.html
+++ /dev/null

@@ -1,11 +0,0 @@
-<h2 id="lpmsg">LAPI_Msg_string</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Retrieves
-the message that is associated with a  subroutine return code.  <a id="idx152" name="idx152"></a> <a id="idx153" name="idx153"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Msgpoll.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Msgpoll.html
deleted file mode 100644
index fa9dd9c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Msgpoll.html
+++ /dev/null

@@ -1,11 +0,0 @@
-<h2 id="lmsgpoll">LAPI_Msgpoll</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Allows the
-calling thread to check communication progress.    <a id="idx154" name="idx154"></a>  <a id="idx155" name="idx155"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Nopoll_wait.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Nopoll_wait.html
deleted file mode 100644
index aabbe25..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Nopoll_wait.html
+++ /dev/null

@@ -1,10 +0,0 @@
-<h2 id="lnpw">LAPI_Nopoll_wait</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Waits
-for a counter update without polling. <a id="idx183" name="idx183"></a> <a id="idx184" name="idx184"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Probe.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Probe.html
deleted file mode 100644
index be44a9c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Probe.html
+++ /dev/null

@@ -1,11 +0,0 @@
-<h2 id="lprob">LAPI_Probe</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Transfers control
-to the communication subsystem to check for arriving messages and to make
-progress in polling mode. <a id="idx156" name="idx156"></a> <a id="idx157" name="idx157"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Purge_totask.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Purge_totask.html
deleted file mode 100644
index f307d9e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Purge_totask.html
+++ /dev/null

@@ -1,10 +0,0 @@
-<h2 id="lptr">LAPI_Purge_totask</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Allows
-a task to cancel messages to a given destination.  <a id="idx185" name="idx185"></a> <a id="idx186" name="idx186"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Put.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Put.html
deleted file mode 100644
index 6fceaf9..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Put.html
+++ /dev/null

@@ -1,10 +0,0 @@
-<h2 id="lput">LAPI_Put</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Transfers data
-from a local task to a remote task.  <a id="idx158" name="idx158"></a> <a id="idx159" name="idx159"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Putv.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Putv.html
deleted file mode 100644
index 8c2d72a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Putv.html
+++ /dev/null

@@ -1,10 +0,0 @@
-<h2 id="lputv">LAPI_Putv</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Transfers vectors
-of data from a local task to a remote task.   <a id="idx160" name="idx160"></a> <a id="idx161" name="idx161"></a></p>
-</div>
-To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Qenv.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Qenv.html
deleted file mode 100644
index 09fa859..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Qenv.html
+++ /dev/null

@@ -1,12 +0,0 @@
-<h2 id="qenv">LAPI_Qenv</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Used to query
-LAPI for runtime task information.  <a id="idx162" name="idx162"></a> <a id="idx163" name="idx163"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.
-
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Resume_totask.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Resume_totask.html
deleted file mode 100644
index bf76fac..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Resume_totask.html
+++ /dev/null

@@ -1,11 +0,0 @@
-<h2 id="lrtt">LAPI_Resume_totask</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Re-enables
-the sending of messages to the task.  <a id="idx187" name="idx187"></a> <a id="idx188" name="idx188"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Rmw.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Rmw.html
deleted file mode 100644
index 8e2c143..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Rmw.html
+++ /dev/null

@@ -1,11 +0,0 @@
-<h2 id="lrmw">LAPI_Rmw</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Provides data
-synchronization primitives.  <a id="idx164" name="idx164"></a> <a id="idx165" name="idx165"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Rmw64.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Rmw64.html
deleted file mode 100644
index 266ae6f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Rmw64.html
+++ /dev/null

@@ -1,11 +0,0 @@
-<h2 id="lrmwb">LAPI_Rmw64</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Provides data
-synchronization primitives for 64-bit applications.   <a id="idx166" name="idx166"></a> <a id="idx167" name="idx167"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Senv.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Senv.html
deleted file mode 100644
index 8966b3e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Senv.html
+++ /dev/null

@@ -1,11 +0,0 @@
-<h2 id="lsenv">LAPI_Senv</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Used to set
-a runtime variable.  <a id="idx168" name="idx168"></a><a id="idx169" name="idx169"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Setcntr.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Setcntr.html
deleted file mode 100644
index df7887f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Setcntr.html
+++ /dev/null

@@ -1,11 +0,0 @@
-<h2 id="setcnt">LAPI_Setcntr</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Used to set
-a counter to a specified  value.  <a id="idx170" name="idx170"></a> <a id="idx171" name="idx171"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Setcntr_wstatus.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Setcntr_wstatus.html
deleted file mode 100644
index 2174ae9..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Setcntr_wstatus.html
+++ /dev/null

@@ -1,12 +0,0 @@
-<h2 id="setcntw">LAPI_Setcntr_wstatus</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Used
-to set a counter to a specified value and to set the associated destination
-list array and destination status array to the counter.   <a id="idx189" name="idx189"></a> <a id="idx190" name="idx190"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Term.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Term.html
deleted file mode 100644
index 09fe99c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Term.html
+++ /dev/null

@@ -1,11 +0,0 @@
-<h2 id="lterm">LAPI_Term</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Terminates and
-cleans up a LAPI context. <a id="idx172" name="idx172"></a> <a id="idx173" name="idx173"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Util.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Util.html
deleted file mode 100644
index 309608b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Util.html
+++ /dev/null

@@ -1,14 +0,0 @@
-<h2 id="lutil">LAPI_Util</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Serves as a
-wrapper function for  <span>such data gather/scatter operations as registration
-and reservation,</span>  <span>for updating UDP port information, and for obtaining
-pointers to locking and signaling functions that are  associated with a shared
-LAPI lock</span>. <a id="idx174" name="idx174"></a> <a id="idx175" name="idx175"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Waitcntr.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Waitcntr.html
deleted file mode 100644
index fe582b9..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Waitcntr.html
+++ /dev/null

@@ -1,11 +0,0 @@
-<h2 id="lwait">LAPI_Waitcntr</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Waits until
-a specified counter reaches the value specified.  <a id="idx176" name="idx176"></a> <a id="idx177" name="idx177"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Xfer.html b/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Xfer.html
deleted file mode 100644
index a0c9c92..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/html/LAPI_Xfer.html
+++ /dev/null

@@ -1,11 +0,0 @@
-<h2 id="lxfer">LAPI_Xfer</h2>
-<h4>Purpose</h4>
-
-<div class="ledi">
-<p>Serves as a
-wrapper function for LAPI data transfer functions. <a id="idx178" name="idx178"></a> <a id="idx179" name="idx179"></a></p>
-</div>
-<p>To complete the help information in the LAPI Eclipse plug-ins,
-contact IBM HPC Cluster support for exact location of more extensive help
-files for the LAPI Eclipse plug-in.
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/icons/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.lapi/icons/.cvsignore
deleted file mode 100644
index 32f2eb8..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/icons/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-pspbrwse.jbf

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/icons/lapi.gif b/tools/pldt/org.eclipse.ptp.pldt.lapi/icons/lapi.gif
deleted file mode 100644
index 32437d2..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/icons/lapi.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/plugin.properties b/tools/pldt/org.eclipse.ptp.pldt.lapi/plugin.properties
deleted file mode 100644
index 2926f6f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/plugin.properties
+++ /dev/null

@@ -1,18 +0,0 @@
-#    test plugin.properties
-# These names will be used in plugin.xml 
-#
-
-pluginName=PTP Parallel Language Development Tools LAPI Support
-pluginProvider=Eclipse.org
-
-view.name=LAPI Artifact View
-viewcat.name=PTP LAPI Views
-run.label=Run LAPI Analysis
-run.tooltip=Run LAPI Analysis on selected file, folder, or project to find LAPI Artifacts
-
-#need to add more
-lapi.page.name = LAPI
-lapi.artifactMarker.extension.name = LAPI Artifact Marker
-lapi.annotMarker.specification.label = LAPI Annotation Marker
-find.lapi.artifacts.command.name = find lapi artifacts
-show.lapi.artifacts.command.label = Show LAPI Artifacts
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/plugin.xml b/tools/pldt/org.eclipse.ptp.pldt.lapi/plugin.xml
deleted file mode 100644
index 3675c41..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/plugin.xml
+++ /dev/null

@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   
-   <extension
-         point="org.eclipse.ui.preferencePages">
-         <page
-            class="org.eclipse.ptp.pldt.lapi.prefs.LAPIPreferencePage"
-            id="org.eclipse.ptp.pldt.lapi.prefpage"
-            category="org.eclipse.ptp.pldt.common.prefs.PLDTPreferencePage"
-            name="%lapi.page.name"/>
-         
-   </extension>
-
-   <!--  LAPI markers -->
-   <extension point="org.eclipse.core.resources.markers"
-		id="lapiMarker"
-        name="%lapi.artifactMarker.extension.name">
-    <super type="org.eclipse.core.resources.textmarker"/>
-   </extension>
-   <!-- this changes the marker image in the editor marker bar  -->
-   <extension
-         point="org.eclipse.ui.editors.annotationTypes">
-      <type
-            markerType="org.eclipse.ptp.pldt.lapi.lapiMarker"
-            name="org.eclipse.ptp.pldt.lapi.lapiMarkerAnnotation">
-      </type>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors.markerAnnotationSpecification">
-      <specification
-            annotationType="org.eclipse.ptp.pldt.lapi.lapiMarkerAnnotation"
-            icon="icons/lapi.gif" 
-            
-            presentationLayer="3"
-            label="%lapi.annotMarker.specification.label"
-            
-            textPreferenceKey="lapiIndication"
-            textPreferenceValue="true"
-            highlightPreferenceKey="artifactHighlighting"
-            highlightPreferenceValue="false"
-            colorPreferenceKey="artifactIndicationColor"
-            colorPreferenceValue="128,128,192"
-            verticalRulerPreferenceKey="artifactIndicationInVerticalRuler"
-            verticalRulerPreferenceValue="true"
-			showInNextPrevDropdownToolbarActionKey="showPortingInNextPrevDropdownToolbarAction"
-            showInNextPrevDropdownToolbarAction="false"
-            overviewRulerPreferenceKey="artifactIndicationInOverviewRuler"
-            overviewRulerPreferenceValue="true"
-            
-            includeOnPreferencePage="true"
-            isGoToPreviousNavigationTargetKey="isPortingGoToPreviousNavigationTarget"
-
-            isGoToNextNavigationTargetKey="isPortingRecordGoToNextNavigationTarget"
-            >
-      </specification>  
-   </extension>
-   <extension
-         point="org.eclipse.ui.views">
-      <view
-            name="%view.name"
-            icon="icons/lapi.gif"
-            category="org.eclipse.ptp.ui.views"
-            class="org.eclipse.ptp.pldt.lapi.views.LapiArtifactView"
-            id="org.eclipse.ptp.pldt.lapi.views.LapiArtifactView">
-      </view>
-   </extension>
-   <extension
-         point="org.eclipse.cdt.ui.CHelpProvider">
-      <provider
-            class="org.eclipse.ptp.pldt.lapi.editorHelp.LapiCHelpInfoProvider"
-            id="org.eclipse.ptp.pldt.lapi.editorHelp.LapiCHelpInfoProvider"/>
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            defaultHandler="org.eclipse.ptp.pldt.lapi.actions.RunAnalyseLAPIcommandHandler"
-            id="org.eclipse.ptp.pldt.lapi.command2"
-            name="%find.lapi.artifacts.command.name">
-      </command>
-   </extension>
-      <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            locationURI="menu:org.eclipse.ptp.pldt.common.toolbar.command1 ">
-         <command
-               commandId="org.eclipse.ptp.pldt.lapi.command2"
-               icon="icons/lapi.gif"
-               label="%show.lapi.artifacts.command.label">
-         </command>
-      </menuContribution>
-   </extension>
-</plugin>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/LAPIArtifactMarkingVisitor.java b/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/LAPIArtifactMarkingVisitor.java
deleted file mode 100644
index 91c7db8..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/LAPIArtifactMarkingVisitor.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.lapi;
-
-import org.eclipse.ptp.pldt.common.ArtifactMarkingVisitor;
-
-/**
- * @since 4.0
- */
-public class LAPIArtifactMarkingVisitor extends ArtifactMarkingVisitor {
-	public LAPIArtifactMarkingVisitor(String markerId) {
-		super(markerId);
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/LapiIDs.java b/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/LapiIDs.java
deleted file mode 100644
index 30dbcea..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/LapiIDs.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,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.lapi;
-
-import org.eclipse.ptp.pldt.lapi.messages.Messages;
-
-/**
- * LAPI Plugin constants
- * 
- * @since 4.0
- */
-public interface LapiIDs {
-	/** Preference page name for LAPI */
-	String LAPI_INCLUDES = Messages.LapiIDs_lapi_includes_pref_page_title;
-
-	String MARKER_ID = "org.eclipse.ptp.pldt.lapi.lapiMarker"; //$NON-NLS-1$
-	String MARKER_ERROR_ID = "org.eclipse.ptp.lap.lapiErrorMarker"; //$NON-NLS-1$
-
-	/** Artifact view id */
-	String LAPI_VIEW_ID = "org.eclipse.ptp.pldt.lapi.views.LapiArtifactView"; //$NON-NLS-1$
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/LapiPlugin.java b/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/LapiPlugin.java
deleted file mode 100644
index 9eb9149..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/LapiPlugin.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,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.lapi;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- * 
- * @since 4.0
- */
-public class LapiPlugin extends AbstractUIPlugin {
-
-	// The shared instance.
-	private static LapiPlugin plugin;
-
-	/**
-	 * The constructor.
-	 */
-	public LapiPlugin() {
-		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 LapiPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given plug-in
-	 * relative path.
-	 * 
-	 * @param path
-	 *            the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.ptp.pldt.lapi", path); //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns the preference setting for LAPI include paths
-	 * 
-	 * @return
-	 */
-	public List<String> getLapiIncludeDirs() {
-		String stringList = getPluginPreferences().getString(LapiIDs.LAPI_INCLUDES);
-		StringTokenizer st = new StringTokenizer(stringList, File.pathSeparator + "\n\r");//$NON-NLS-1$
-		List<String> dirs = new ArrayList<String>();
-		while (st.hasMoreElements()) {
-			dirs.add(st.nextToken());
-		}
-		return dirs;
-	}
-
-	public static String getPluginId() {
-		return "org.eclipse.ptp.pldt.lapi"; //$NON-NLS-1$
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/actions/RunAnalyseLAPIcommandHandler.java b/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/actions/RunAnalyseLAPIcommandHandler.java
deleted file mode 100644
index 47c3ee4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/actions/RunAnalyseLAPIcommandHandler.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.lapi.actions;
-
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.ast.gnu.c.GCCLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.model.ITranslationUnit;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.actions.RunAnalyseHandlerBase;
-import org.eclipse.ptp.pldt.common.util.ViewActivator;
-import org.eclipse.ptp.pldt.lapi.LAPIArtifactMarkingVisitor;
-import org.eclipse.ptp.pldt.lapi.LapiIDs;
-import org.eclipse.ptp.pldt.lapi.LapiPlugin;
-import org.eclipse.ptp.pldt.lapi.analysis.LapiCASTVisitor;
-
-/**
- * @author tibbitts
- * @since 4.0
- * 
- */
-public class RunAnalyseLAPIcommandHandler extends RunAnalyseHandlerBase {
-	/**
-	 * Constructor for the "Run Analysis" action
-	 */
-	public RunAnalyseLAPIcommandHandler() {
-		super("LAPI", new LAPIArtifactMarkingVisitor(LapiIDs.MARKER_ID), LapiIDs.MARKER_ID); //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns LAPI analysis artifacts for file
-	 * 
-	 * @param tu
-	 *            the translation unit representing the file to be analyzed
-	 * @param includes
-	 *            list of Lapi include paths
-	 * @return analysis results
-	 */
-	@Override
-	public ScanReturn doArtifactAnalysis(final ITranslationUnit tu, final List<String> includes) {
-		final ScanReturn msr = new ScanReturn();
-		final String fileName = tu.getElementName();
-		ILanguage lang;
-		try {
-			lang = tu.getLanguage();
-
-			IASTTranslationUnit atu = tu.getAST();
-			if (lang.getId().equals(GCCLanguage.ID)) {// cdt40
-				atu.accept(new LapiCASTVisitor(includes, fileName, msr));
-			}
-
-		} catch (CoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return msr;
-	}
-
-	@Override
-	protected List<String> getIncludePath() {
-		return LapiPlugin.getDefault().getLapiIncludeDirs();
-	}
-
-	@Override
-	protected void activateArtifactView() {
-		ViewActivator.activateView(LapiIDs.LAPI_VIEW_ID);
-	}
-
-	/**
-	 * LAPI doesn't have a problems view (only OpenMP analysis does)
-	 */
-	@Override
-	protected void activateProblemsView() {
-
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/analysis/LapiCASTVisitor.java b/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/analysis/LapiCASTVisitor.java
deleted file mode 100644
index afeae9d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/analysis/LapiCASTVisitor.java
+++ /dev/null

@@ -1,79 +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.lapi.analysis;
-
-
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionCallExpression;
-import org.eclipse.cdt.core.dom.ast.IASTIdExpression;
-import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.analysis.PldtAstVisitor;
-import org.eclipse.ptp.pldt.lapi.messages.Messages;
-
-/**
- * This dom-walker collects "artifacts" related to the specific domain <br>
- * (e.g. LAPI). Currently these artifacts include function calls
- * and constants. It add markers to the source file for C code, marking the
- * position of the artifacts found.
- * 
- * This version extends PldtAstVisitor instead of delegating to<br>
- * MpiGeneralASTVisitorBehavior.
- *
- * @author tibbitts
- * 
- */
-public class LapiCASTVisitor extends PldtAstVisitor 
-{
-    private static final String PREFIX="LAPI_"; //$NON-NLS-1$
-
-    {
-        this.shouldVisitExpressions = true;
-        this.shouldVisitStatements = true;
-        this.shouldVisitDeclarations = true;
-        this.shouldVisitTranslationUnit = true;
-    }
-
-    public LapiCASTVisitor(List mpiIncludes, String fileName, ScanReturn msr)
-    {
-        super(mpiIncludes, fileName, msr);
-		ARTIFACT_CALL = Messages.LapiCASTVisitor_lapi_call;
-		ARTIFACT_CONSTANT=Messages.LapiCASTVisitor_lapi_constant;
-    }
-
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTExpression)
-     */
-    public int visit(IASTExpression expression)
-    {
-        if (expression instanceof IASTFunctionCallExpression) {
-            IASTExpression astExpr = ((IASTFunctionCallExpression) expression).getFunctionNameExpression();
-            String signature = astExpr.getRawSignature();
-            //System.out.println("func signature=" + signature);
-            if (signature.startsWith(PREFIX)) {
-                if (astExpr instanceof IASTIdExpression) {
-                    IASTName funcName = ((IASTIdExpression) astExpr).getName();
-                    processFuncName(funcName, astExpr);
-                }
-            }
-        } else if (expression instanceof IASTLiteralExpression) {
-            processMacroLiteral((IASTLiteralExpression) expression);
-        }
-        return PROCESS_CONTINUE;
-    }
-}
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/editorHelp/LapiCHelpBook.java b/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/editorHelp/LapiCHelpBook.java
deleted file mode 100644
index 2326986..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/editorHelp/LapiCHelpBook.java
+++ /dev/null

@@ -1,94 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,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.lapi.editorHelp;
-
-import org.eclipse.ptp.pldt.common.editorHelp.CHelpBookImpl;
-import org.eclipse.ptp.pldt.common.editorHelp.FunctionPrototypeSummaryImpl;
-import org.eclipse.ptp.pldt.common.editorHelp.FunctionSummaryImpl;
-import org.eclipse.ptp.pldt.lapi.LapiPlugin;
-import org.eclipse.ptp.pldt.lapi.messages.Messages;
-
-
-public class LapiCHelpBook extends CHelpBookImpl {
-	private static final String TITLE = Messages.LapiCHelpBook_LAPI_c_help_book_title;
-
-	public LapiCHelpBook() {
-        super(LapiPlugin.getPluginId());
-		// populate func map
-        funcName2FuncInfo.put("LAPI_Addr_get", new FunctionSummaryImpl("LAPI_Addr_get", "", Messages.LapiCHelpBook_LAPI_Addr_get, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Addr_get", "int", "lapi_handle_t hndl, void **addr, int addr_hndl"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Addr_set", new FunctionSummaryImpl("LAPI_Addr_set", "", Messages.LapiCHelpBook_LAPI_Addr_set, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Addr_set", "int", "lapi_handle_t hndl, void **addr, int addr_hndl"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Address", new FunctionSummaryImpl("LAPI_Address", "", Messages.LapiCHelpBook_LAPI_Address, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Address", "int", "void  *my_addr, ulong *ret_addr"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Address_init", new FunctionSummaryImpl("LAPI_Address_init", "", Messages.LapiCHelpBook_LAPI_Address_init, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Address_init", "int", "lapi_handle_t  hndl, void *my_addr, void *add_tab[ ]"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Address_init64", new FunctionSummaryImpl("LAPI_Address_init64", "", Messages.LapiCHelpBook_LAPI_Address_init64, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Address_init64", "int", "lapi_handle_t  hndl, lapi_long_t my_addr, lapi_long_t *add_tab"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Amsend", new FunctionSummaryImpl("LAPI_Amsend", "", Messages.LapiCHelpBook_LAPI_Amsend, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Amsend", "int", "lapi_handle_t hndl, uint tgt, void *hdr_hdl, void *uhdr, uint uhdr_len, void *udata, ulong udata_len, lapi_cntr_t *tgt_cntr, lapi_cntr_t *org_cntr, lapi_cntr_t *cmpl_cntr"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Amsendv", new FunctionSummaryImpl("LAPI_Amsendv", "", Messages.LapiCHelpBook_LAPI_Amsendv, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Amsendv", "int", "lapi_handle_t hndl, uint tgt, void *hdr_hdl, void *uhdr, uint uhdr_len, lapi_vec_t *org_vec, lapi_cntr_t *tgt_cntr, lapi_cntr_t *org_cntr, lapi_cntr_t *cmpl_cntr"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Fence", new FunctionSummaryImpl("LAPI_Fence", "", Messages.LapiCHelpBook_LAPI_Fence, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Fence", "int", "lapi_handle_t hndl"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Get", new FunctionSummaryImpl("LAPI_Get", "", Messages.LapiCHelpBook_LAPI_Get, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Get", "int", "lapi_handle_t hndl, uint tgt, ulong len, void *tgt_addr, void *org_addr, lapi_cntr_t *tgt_cntr, lapi_cntr_t *org_cntr"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Getcntr", new FunctionSummaryImpl("LAPI_Getcntr", "", Messages.LapiCHelpBook_LAPI_Getcntr, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Getcntr", "int", "lapi_handle_t hndl, lapi_cntr_t *cntr, int *val"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Getv", new FunctionSummaryImpl("LAPI_Getv", "", Messages.LapiCHelpBook_LAPI_Getv, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Getv", "int", "lapi_handle_t hndl, uint tgt, lapi_vec_t *tgt_vec, lapi_vec_t *org_vec, lapi_cntr_t *tgt_cntr, lapi_cntr_t *org_cntr"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Gfence", new FunctionSummaryImpl("LAPI_Gfence", "", Messages.LapiCHelpBook_LAPI_Gfence, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Gfence", "int", "lapi_handle_t hndl"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Init", new FunctionSummaryImpl("LAPI_Init", "", Messages.LapiCHelpBook_LAPI_Init, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Init", "int", "lapi_handle_t *hndl, lapi_info_t *lapi_info"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Msg_string", new FunctionSummaryImpl("LAPI_Msg_string", "", Messages.LapiCHelpBook_LAPI_Msg_string, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Msg_string", "int", "int error_code, void *buf"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Msgpoll", new FunctionSummaryImpl("LAPI_Msgpoll", "", Messages.LapiCHelpBook_LAPI_Msgpoll, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Msgpoll", "int", "lapi_handle_t hndl, uint cnt, lapi_msg_info_t  *info"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Probe", new FunctionSummaryImpl("LAPI_Probe", "", Messages.LapiCHelpBook_LAPI_Probe, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Probe", "int", "lapi_handle_t hndl"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Put", new FunctionSummaryImpl("LAPI_Put", "", Messages.LapiCHelpBook_LAPI_Put, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Put", "int", "lapi_handle_t hndl, uint tgt, ulong len, void *tgt_addr, void *org_addr, lapi_cntr_t *tgt_cntr, lapi_cntr_t *org_cntr, lapi_cntr_t *cmpl_cntr"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Putv", new FunctionSummaryImpl("LAPI_Putv", "", Messages.LapiCHelpBook_LAPI_Putv, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Putv", "int", "lapi_handle_t hndl, uint tgt, lapi_vec_t *tgt_vec, lapi_vec_t *org_vec, lapi_cntr_t *tgt_cntr, lapi_cntr_t *org_cntr, lapi_cntr_t *cmpl_cntr"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Qenv", new FunctionSummaryImpl("LAPI_Qenv", "", Messages.LapiCHelpBook_LAPI_Qenv, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Qenv", "int", "lapi_handle_t hndl, lapi_query_t query, int *ret_val"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Rmw", new FunctionSummaryImpl("LAPI_Rmw", "", Messages.LapiCHelpBook_LAPI_Rmw, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Rmw", "int", "lapi_handle_t hndl, RMW_ops_t op, uint tgt, int *tgt_var, int *in_val, int *prev_tgt_val, lapi_cntr_t *org_cntr"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Rmw64", new FunctionSummaryImpl("LAPI_Rmw64", "", Messages.LapiCHelpBook_LAPI_Rmw64, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Rmw64", "int", "lapi_handle_t hndl, Rmw_ops_t op, uint tgt, long long *tgt_var, long long *in_val, long long *prev_tgt_val, lapi_cntr_t *org_cntr"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Senv", new FunctionSummaryImpl("LAPI_Senv", "", Messages.LapiCHelpBook_LAPI_Senv, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Senv", "int", "lapi_handle_t hndl, lapi_query_t query, int set_val"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Setcntr", new FunctionSummaryImpl("LAPI_Setcntr", "", Messages.LapiCHelpBook_LAPI_Setcntr, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Setcntr", "int", "lapi_handle_t hndl, lapi_cntr_t *cntr, int val"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Term", new FunctionSummaryImpl("LAPI_Term", "", Messages.LapiCHelpBook_LAPI_Term, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Term", "int", "lapi_handle_t hndl"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Util", new FunctionSummaryImpl("LAPI_Util", "", Messages.LapiCHelpBook_LAPI_Util, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Util", "int", "lapi_handle_t hndl, lapi_util_t *util_cmd"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Waitcntr", new FunctionSummaryImpl("LAPI_Waitcntr", "", Messages.LapiCHelpBook_LAPI_Waitcntr, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-    		  	new FunctionPrototypeSummaryImpl("LAPI_Waitcntr", "int", "lapi_handle_t hndl, lapi_cntr_t *cntr, int val, int *cur_cntr_val"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Xfer", new FunctionSummaryImpl("LAPI_Xfer", "", Messages.LapiCHelpBook_LAPI_Xfer, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-    		  	new FunctionPrototypeSummaryImpl("LAPI_Xfer", "int", "lapi_handle_t hndl, lapi_xfer_t *xfer_cmd"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Nopoll_wait", new FunctionSummaryImpl("LAPI_Nopoll_wait", "", Messages.LapiCHelpBook_LAPI_Nopoll_wait, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Nopoll_wait", "int", "lapi_handle_t hndl, lapi_cntr_t *cntr_ptr, int val, int *cur_cntr_val"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Purge_totask", new FunctionSummaryImpl("LAPI_Purge_totask", "", Messages.LapiCHelpBook_LAPI_Purge_totask, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Purge_totask", "int", "lapi_handle_t hndl, uint dest"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Resume_totask", new FunctionSummaryImpl("LAPI_Resume_totask", "", Messages.LapiCHelpBook_LAPI_Resume_totask, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Resume_totask", "int", "lapi_handle_t hndl, uint dest"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-        funcName2FuncInfo.put("LAPI_Setcntr_wstatus", new FunctionSummaryImpl("LAPI_Setcntr_wstatus", "", Messages.LapiCHelpBook_LAPI_Setcntr_wstatus, //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-                new FunctionPrototypeSummaryImpl("LAPI_Setcntr_wstatus", "int", "lapi_handle_t hndl, lapi_cntr_t *cntr, int num_dest, uint *dest_list, int *dest_status"), null)); //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$
-//        funcName2FuncInfo.put("LAPI_Fence", new FunctionSummary("LAPI_Fence", "", "DESC",
-//                new FunctionPrototypeSummary("LAPI_Fence", "int", "ARGS"), null));
-
-        // set title
-        setTitle(TITLE);
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/editorHelp/LapiCHelpInfoProvider.java b/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/editorHelp/LapiCHelpInfoProvider.java
deleted file mode 100644
index dfc33c1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/editorHelp/LapiCHelpInfoProvider.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.lapi.editorHelp;
-
-import org.eclipse.ptp.pldt.common.editorHelp.CHelpProviderImpl;
-
-/**
- * 
- * This class implements ICHelpProvider and provides LAPI information <br>
- * (F1, hover, content assist, etc.)
- * 
- */
-
-public class LapiCHelpInfoProvider extends CHelpProviderImpl {
-
-	public LapiCHelpInfoProvider() {
-		// for debug use only, to see where it's called..
-		//System.out.println("LapiCHelpInfoProvider ctor()...");
-	}
-
-	public void initialize() {
-		helpBook = new LapiCHelpBook();
-		//System.out.println("LapiCHelpInfoProvider initialize()...");
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/messages/Messages.java b/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/messages/Messages.java
deleted file mode 100644
index 13fbc86..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/messages/Messages.java
+++ /dev/null

@@ -1,65 +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.lapi.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.pldt.lapi.messages.messages"; //$NON-NLS-1$
-	public static String LapiArtifactView_construct_column_title;
-	public static String LapiArtifactView_lapi_artifact_column_title;
-	public static String LapiArtifactView_lapi_artifacts_plural;
-	public static String LapiCASTVisitor_lapi_call;
-	public static String LapiCASTVisitor_lapi_constant;
-	public static String LapiIDs_lapi_includes_pref_page_title;
-	public static String LAPIPreferencePage_includes_preference_browse_dialog_title;
-	public static String LAPIPreferencePage_includes_preference_label;
-	
-	public static String LapiCHelpBook_LAPI_Addr_get;
-	public static String LapiCHelpBook_LAPI_Addr_set;
-	public static String LapiCHelpBook_LAPI_Address;
-	public static String LapiCHelpBook_LAPI_Address_init;
-	public static String LapiCHelpBook_LAPI_Address_init64;
-	public static String LapiCHelpBook_LAPI_Amsend;
-	public static String LapiCHelpBook_LAPI_Amsendv;
-	public static String LapiCHelpBook_LAPI_c_help_book_title;
-	public static String LapiCHelpBook_LAPI_Fence;
-	public static String LapiCHelpBook_LAPI_Get;
-	public static String LapiCHelpBook_LAPI_Getcntr;
-	public static String LapiCHelpBook_LAPI_Getv;
-	public static String LapiCHelpBook_LAPI_Gfence;
-	public static String LapiCHelpBook_LAPI_Init;
-	public static String LapiCHelpBook_LAPI_Msg_string;
-	public static String LapiCHelpBook_LAPI_Msgpoll;
-	public static String LapiCHelpBook_LAPI_Nopoll_wait;
-	public static String LapiCHelpBook_LAPI_Probe;
-	public static String LapiCHelpBook_LAPI_Purge_totask;
-	public static String LapiCHelpBook_LAPI_Put;
-	public static String LapiCHelpBook_LAPI_Putv;
-	public static String LapiCHelpBook_LAPI_Qenv;
-	public static String LapiCHelpBook_LAPI_Resume_totask;
-	public static String LapiCHelpBook_LAPI_Rmw;
-	public static String LapiCHelpBook_LAPI_Rmw64;
-	public static String LapiCHelpBook_LAPI_Senv;
-	public static String LapiCHelpBook_LAPI_Setcntr;
-	public static String LapiCHelpBook_LAPI_Setcntr_wstatus;
-	public static String LapiCHelpBook_LAPI_Term;
-	public static String LapiCHelpBook_LAPI_Util;
-	public static String LapiCHelpBook_LAPI_Waitcntr;
-	public static String LapiCHelpBook_LAPI_Xfer;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/messages/messages.properties b/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/messages/messages.properties
deleted file mode 100644
index ead41d9..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/messages/messages.properties
+++ /dev/null

@@ -1,42 +0,0 @@
-LapiArtifactView_construct_column_title=Construct
-LapiArtifactView_lapi_artifact_column_title=LAPI Artifact
-LapiArtifactView_lapi_artifacts_plural=LAPI Artifacts
-LapiCASTVisitor_lapi_call=LAPI Call
-LapiCASTVisitor_lapi_constant=LAPI Constant
-LapiIDs_lapi_includes_pref_page_title=LAPI Includes
-LAPIPreferencePage_includes_preference_browse_dialog_title=Please choose a directory for LAPI includes:
-LAPIPreferencePage_includes_preference_label=LAPI include paths:
-
-LapiCHelpBook_LAPI_Addr_get=Retrieves a function address that was previously registered using LAPI_Addr_set.
-LapiCHelpBook_LAPI_Addr_set=Registers the address of a function.
-LapiCHelpBook_LAPI_Address=Returns an unsigned long value for a specified user address.
-LapiCHelpBook_LAPI_Address_init=Creates a remote address table.
-LapiCHelpBook_LAPI_Address_init64=Creates a 64-bit remote address table.
-LapiCHelpBook_LAPI_Amsend=Transfers a user message to a remote task, obtaining the target address on the remote task from a user-specified header handler.
-LapiCHelpBook_LAPI_Amsendv=Transfers a user vector to a remote task, obtaining the target address on the remote task from a user-specified header handler.
-LapiCHelpBook_LAPI_c_help_book_title=LAPI C Help Book
-LapiCHelpBook_LAPI_Fence=Enforces order on LAPI calls.
-LapiCHelpBook_LAPI_Get=Copies data from a remote task to a local task.
-LapiCHelpBook_LAPI_Getcntr=Gets the integer value of a specified LAPI counter.
-LapiCHelpBook_LAPI_Getv=Copies vectors of data from a remote task to a local task.
-LapiCHelpBook_LAPI_Gfence=Enforces order on LAPI calls across all tasks and provides barrier synchronization among them.
-LapiCHelpBook_LAPI_Init=Initializes a LAPI context.
-LapiCHelpBook_LAPI_Msg_string=Retrieves the message that is associated with a subroutine return code.
-LapiCHelpBook_LAPI_Msgpoll=Allows the calling thread to check communication progress.
-LapiCHelpBook_LAPI_Nopoll_wait=Waits for a counter update without polling.
-LapiCHelpBook_LAPI_Probe=Transfers control to the communication subsystem to check for arriving messages and to make progress in polling mode.
-LapiCHelpBook_LAPI_Purge_totask=Allows a task to cancel messages to a given destination.
-LapiCHelpBook_LAPI_Put=Transfers data from a local task to a remote task.
-LapiCHelpBook_LAPI_Putv=Transfers vectors of data from a local task to a remote task.
-LapiCHelpBook_LAPI_Qenv=Used to query LAPI for runtime task information.
-LapiCHelpBook_LAPI_Resume_totask=Re-enables the sending of messages to the task.
-LapiCHelpBook_LAPI_Rmw=Provides data synchronization primitives.
-LapiCHelpBook_LAPI_Rmw64=Provides data synchronization primitives for 64-bit applications.
-LapiCHelpBook_LAPI_Senv=Used to set a runtime variable.
-LapiCHelpBook_LAPI_Setcntr=Used to set a counter to a specified value.
-LapiCHelpBook_LAPI_Setcntr_wstatus=Used to set a counter to a specified value and to set the associated destination list array and destination status array to the counter.
-LapiCHelpBook_LAPI_Term=Terminates and cleans up a LAPI context.
-LapiCHelpBook_LAPI_Util=LAPI Utility
-LapiCHelpBook_LAPI_Waitcntr=Waits until a specified counter reaches the value specified.
-LapiCHelpBook_LAPI_Xfer=Serves as a wrapper function for LAPI data transfer functions.
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/prefs/LAPIPreferencePage.java b/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/prefs/LAPIPreferencePage.java
deleted file mode 100644
index 627cd48..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/prefs/LAPIPreferencePage.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,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.lapi.prefs;
-
-
-
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PathEditor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.pldt.lapi.LapiIDs;
-import org.eclipse.ptp.pldt.lapi.LapiPlugin;
-import org.eclipse.ptp.pldt.lapi.messages.Messages;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-/**
- * Preference page based on FieldEditorPreferencePage
- * 
- * @author xue
- */
-
-public class LAPIPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage
-{
-    private static final String INCLUDES_PREFERENCE_LABEL  = Messages.LAPIPreferencePage_includes_preference_label;
-    private static final String INCLUDES_PREFERENCE_BROWSE = Messages.LAPIPreferencePage_includes_preference_browse_dialog_title;
-    public LAPIPreferencePage()
-    {
-        super(FLAT);
-        initPreferenceStore();
-    }
-
-    public LAPIPreferencePage(int style)
-    {
-        super(style);
-        initPreferenceStore();
-    }
-
-    public LAPIPreferencePage(String title, ImageDescriptor image, int style)
-    {
-        super(title, image, style);
-        initPreferenceStore();
-    }
-
-    public LAPIPreferencePage(String title, int style)
-    {
-        super(title, style);
-        initPreferenceStore();
-    }
-
-    /**
-     * Init preference store and set the preference store for the preference page
-     */
-    private void initPreferenceStore()
-    {
-        IPreferenceStore store = LapiPlugin.getDefault().getPreferenceStore();
-        setPreferenceStore(store);
-    }
-
-    public void init(IWorkbench workbench)
-    {
-    }
-
-    protected void createFieldEditors()
-    {
-        PathEditor pathEditor = new PathEditor(LapiIDs.LAPI_INCLUDES, INCLUDES_PREFERENCE_LABEL,
-                INCLUDES_PREFERENCE_BROWSE, getFieldEditorParent());
-        addField(pathEditor);
-
-        //"Use default?"
-//        BooleanFieldEditor bed = new BooleanFieldEditor(LAPI_HELP_DEFAULT_ID,LAPI_HELP_DEFAULT,getFieldEditorParent());
-//        addField(bed);
-  /*      
-        int numCol=1;
-    	RadioGroupFieldEditor choiceFE = new RadioGroupFieldEditor(LAPI_WHICH_HELP_ID, LAPI_HELP, numCol, new String[][] {
-				{ LAPI_HELP_DEFAULT, "choice1" }, 
-				{ LAPI_HELP_AIX+LAPI_LOCATION_AIX, "choice2" }, 
-				{ LAPI_HELP_LINUX+LAPI_LOCATION_LINUX, "Choice3" },
-				{ LAPI_HELP_OTHER, "Choice4" }},
-				getFieldEditorParent());
-    	addField(choiceFE);
-    	
-    	StringFieldEditor otherLoc=new StringFieldEditor(LAPI_HELP_OTHER_ID, LAPI_HELP_OTHER,getFieldEditorParent());
-    	addField(otherLoc);
-    	*/
-    	
-    }
-    
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/views/LapiArtifactView.java b/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/views/LapiArtifactView.java
deleted file mode 100644
index ad80a72..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.lapi/src/org/eclipse/ptp/pldt/lapi/views/LapiArtifactView.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,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.lapi.views;
-
-import org.eclipse.ptp.pldt.common.views.SimpleTableMarkerView;
-import org.eclipse.ptp.pldt.lapi.LapiIDs;
-import org.eclipse.ptp.pldt.lapi.LapiPlugin;
-import org.eclipse.ptp.pldt.lapi.messages.Messages;
-
-
-
-/**
- * A LAPI artifact view based on SimpleTableView Note that the ID must be unique.
- * 
- */
-public class LapiArtifactView extends SimpleTableMarkerView
-{
-    public LapiArtifactView()
-    {
-        // if you need to read icon images, etc. from the plug-in, be sure to pass
-        // in an actual Plugin class instance for first arg
-        super(LapiPlugin.getDefault(), Messages.LapiArtifactView_lapi_artifact_column_title, Messages.LapiArtifactView_lapi_artifacts_plural, Messages.LapiArtifactView_construct_column_title, LapiIDs.MARKER_ID);
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/.classpath b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/.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.analysis.cdt/.project b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/.project
deleted file mode 100644
index 5bd673d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.mpi.analysis.cdt</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.analysis.cdt/.settings/org.eclipse.jdt.core.prefs b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e594427..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,8 +0,0 @@
-#Fri Apr 16 12:50:39 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.analysis.cdt/META-INF/MANIFEST.MF b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/META-INF/MANIFEST.MF
deleted file mode 100644
index af288af..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.pldt.mpi.analysis.cdt
-Bundle-Version: 4.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.pldt.mpi.analysis.cdt.Activator
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.cdt.core,
- org.eclipse.core.resources
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs,
- org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.impl
-Bundle-Vendor: %pluginProvider
-Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/about.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/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.analysis.cdt/build.properties b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/build.properties
deleted file mode 100644
index b67aba1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/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.mpi.analysis.cdt/plugin.properties b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/plugin.properties
deleted file mode 100644
index c1fb5bb..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/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 Parallel Language Development Tools CDT Analysis
-pluginProvider=Eclipse.org

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/Activator.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/Activator.java
deleted file mode 100644
index 3cb0b63..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/Activator.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis.cdt;
-
-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.pldt.mpi.analysis.cdt"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (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/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/GraphCreator.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/GraphCreator.java
deleted file mode 100644
index 41249e0..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/GraphCreator.java
+++ /dev/null

@@ -1,192 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-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.ptp.pldt.mpi.analysis.cdt.graphs.impl.CallGraph;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.impl.ResourceCollector;
-
-/**
- * Convenience class for constructing various graphs from C source files
- * 
- * @author Beth Tibbitts
- *
- */
-public class GraphCreator {
-	/**
-	 * Convenience method for initializing and computing the call graph in one place.
-	 * <br>This is done in two steps:
-	 * <br>(1) initCallGraph(): initialize call graph with function information
-	 * <br>(2) computeCallGraph(): compute caller/callee/recursive etc. info on the graph
-	 * @param resource
-	 * @return
-	 */
-	public ICallGraph createCallGraph(IResource resource) {
-		ICallGraph cg = initCallGraph(resource);
-		computeCallGraph(cg);
-		return cg;
-		
-	}
-	/**
-	 * Create call graph structure from resources (C source files) but caller/callee 
-	 * calculations are not done yet; will descend to children of a container if
-	 * called with a folder or project argument.
-	 * @param resource
-	 * @return call graph initialized with basic function information
-	 */
-	public ICallGraph initCallGraph(IResource resource) {
-		ICallGraph callGraph = new CallGraph();
-		callGraph = initCallGraph(resource, callGraph);
-		return callGraph;
-
-	}
-	/**
-	 * Add information to an existing call graph.
-	 *  <br>Will descend to children if this is a container (folder or project)
-	 *  
-	 * @param resource contains source file(s) whose functions will be found and added to the call graph.  
-	 * @param callGraph
-	 * @return
-	 */
-	public ICallGraph initCallGraph(IResource resource, ICallGraph callGraph) {
-		boolean foundError = resourceCollector(resource, callGraph);
-		if(foundError) {
-			System.out.println("Error occurred during call graph creation."); //$NON-NLS-1$
-		}
-		return callGraph;
-	}
-	/**
-	 * Create an empty call graph, ready to fill with function information
-	 * later with subsequent calls to initCallGraph(resource, callGraph)
-	 * @return
-	 */
-	public ICallGraph initCallGraph() {
-		return new CallGraph();
-	}
-	/**
-	 * Calculate the caller/callee and recursive properties of the call graph
-	 * @return
-	 */
-	public ICallGraph computeCallGraph(ICallGraph callGraph) {
-		callGraph.buildCG();
-		return callGraph;
-	}
-
-	
-	/**
-	 * Run analysis ("Resource collector") on a resource (e.g. File or Folder) 
-	 * and add the function information found in/under the given resource (file or container)
-	 * to the given call graph
-	 * <br>Will descend to members of folder
-	 * 
-	 * @param resource
-	 *            the resource selected by the user
-	 * @param callGraph the call graph to which the information will be appended
-	 * @return
-	 */
-	public boolean resourceCollector(IResource resource, ICallGraph callGraph) {
-
-		boolean foundError = false;
-
-		// if it's a C file, collect info in the call graph for this file
-		if (resource instanceof IFile) {
-			IFile file = (IFile) resource;
-			String filename = file.getName();
-			if (filename.endsWith(".c")) { //$NON-NLS-1$
-				ResourceCollector rc = new ResourceCollector(callGraph, file);
-				rc.run();
-			}
-			// if it's a container, run resourceCollector on each of its members
-		} else if (resource instanceof IContainer) {
-			IContainer container = (IContainer) resource;
-			try {
-				IResource[] mems = container.members();
-				for (int i = 0; i < mems.length; i++) {
-					boolean err = resourceCollector(mems[i], callGraph);
-					foundError = foundError || err;
-				}
-			} catch (CoreException e) {
-				e.printStackTrace();
-				foundError=true;
-			}
-		} else {
-			// ?????
-			String name = ""; //$NON-NLS-1$
-			if (resource instanceof IResource) {
-				IResource res = (IResource) resource;
-				// name=res.getName(); // simple filename only, no path info
-				IPath path = res.getProjectRelativePath();
-				name = path.toString();
-			}
-			System.out.println("Cancelled by User, aborting analysis on subsequent files... " //$NON-NLS-1$
-							+ name);
-		}
-
-		return foundError;
-	}
-	/**
-	 * Print a call graph structure
-	 * @param cg the call graph to print
-	 */
-	public void showCallGraph(ICallGraph cg) {
-		System.out.println("Show call graph"); //$NON-NLS-1$
-		List<ICallGraphNode> nodes = cg.getAllNodes();
-		for (Iterator<ICallGraphNode> iterator = nodes.iterator(); iterator.hasNext();) {
-			ICallGraphNode cgNode =  iterator.next();
-			printCGNode(cgNode, ""); //$NON-NLS-1$
-			//System.out.println("  callers: ==>");
-	
-			for (Iterator<ICallGraphNode> iterator2 = cgNode.getCallers().iterator(); iterator2.hasNext();) {
-				ICallGraphNode caller = iterator2.next();
-				printCGNode(caller,"    caller: ");			 //$NON-NLS-1$
-			}
-			//System.out.println("  <== callees:");
-			for (Iterator<ICallGraphNode> iterator3 = cgNode.getCallees().iterator(); iterator3.hasNext();) {
-				ICallGraphNode callee =  iterator3.next();
-				printCGNode(callee,"    callee: "); //$NON-NLS-1$
-				
-			}
-			System.out.println(" "); //$NON-NLS-1$
-			
-		}
-		List<List<ICallGraphNode>>cycles = cg.getCycles();
-		System.out.println("Recursive cycles:"); //$NON-NLS-1$
-		for (List<ICallGraphNode> cycle : cycles) {
-			System.out.println("Cycle: "); //$NON-NLS-1$
-			for (Iterator<ICallGraphNode> iterator = cycle.iterator(); iterator.hasNext();) {
-				ICallGraphNode fn =  iterator.next();
-				System.out.print(" "+fn.getFuncName()); //$NON-NLS-1$
-				
-			}
-			System.out.println(" \n"); //$NON-NLS-1$
-		}
-		List<String> vars= cg.getEnv();
-		System.out.println("Global variables:"); //$NON-NLS-1$
-		for (Iterator<String> varit= vars.iterator(); varit.hasNext();) {
-			String var = varit.next();
-			System.out.println("Global var: "+var); //$NON-NLS-1$
-			
-		}
-		
-	}
-	public void printCGNode(ICallGraphNode cgNode, String prefix) {
-		System.out.println(prefix+" "+cgNode.getFuncName()+" in "+cgNode.getFileName()); //$NON-NLS-1$ //$NON-NLS-2$
-		cgNode.getCFG();
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/IBlock.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/IBlock.java
deleted file mode 100644
index f61b879..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/IBlock.java
+++ /dev/null

@@ -1,145 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis.cdt.graphs;
-
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-
-/**
- * A "Block" contains either a single statement or a predicate expression, 
- * and it can be entered only at the beginning and exited only at the end.
- * 
- * @author Yuan Zhang
- *
- */
-public interface IBlock {
-	/**
-	 * @return the unique ID
-	 */
-	public int getID();
-
-	/**
-	 * @return the list of successors in the control flow graph
-	 */
-	public List<IBlock> getSuccs();
-	
-	/**
-	 * @return the list of predecessors in the control flow graph
-	 */
-	public List<IBlock> getPreds();
-	
-	/**
-	 * @return the next  block in CFG according to the topological 
-	 * order (top-down order)
-	 */
-	public IBlock topNext();
-	/**
-	 * @return the next  block in CFG according to the topological 
-	 * order (top-down order)
-	 */
-	public IBlock getTopNext();
-	/**
-	 * Set the next  block in CFG according to the topological 
-	 * order (top-down order)
-	 */
-	public void setTopNext(IBlock b);
-	
-	/**
-	 * Get the next block in CFG according to the reverse
-	 * topological order (bottom-up order)
-	 */
-	public IBlock botNext();
-	/**
-	 * Get the next block in CFG according to the reverse
-	 * topological order (bottom-up order)
-	 */
-	public IBlock getBotNext();
-	/**
-	 * Set the next block in CFG according to the reverse
-	 * topological order (bottom-up order)
-	 */
-	public void setBotNext(IBlock b);
-
-	/**
-	 * @return the content (a predicate expression or a statement)
-	 */
-	public IASTNode getContent();
-	
-	/**
-	 * Search to determine if a block contains an expression
-	 * @return true if this block contains expression expr
-	 * which is the predicate of statement <parent>, false otherwise.
-	 */
-	public boolean search(IASTExpression expr, IASTStatement parent);
-	/** 
-	 * Search to determine if a block contains a statement
-	 * @return true if this block contains statement stmt,
-	 * false otherwise.
-	 */
-	public boolean search(IASTStatement stmt);
-	/**
-	 * Search to determine if a block contains a given label
-	 * @return true if this block contains label, false otherwise
-	 */
-	public boolean search(IASTName label);
-	
-	/**
-	 * Get Dominators<br>
-	 * Block A dominates another block B if every path from the entry that 
-	 * reaches  block B has to pass through  block A.
-	 * The entry block dominates all blocks.
-	 * @return list of dominator IBlocks
-	 */
-	public List<IBlock> getDOM();
-	/**
-	 * Set dominators
-	 * @param set list of dominators
-	 */
-	public void setDOM(List<IBlock> set);
-	
-	/**
-	 * Get post-dominators<br>
-	 * Block A postdominates block B if every path from B to the exit has to pass through block A.  
-	 * The exit block postdominates all blocks.
-	 * 
-	 * @return list of post-dominator IBlocks
-	 */
-	public List<IBlock> getPDOM();
-	/**
-	 * set post-dominators
-	 * @param set
-	 */
-	public void setPDOM(List<IBlock> set);
-
-	/** 
-	 * An attribute (identified by its name) of a block could be any 
-	 * property of it.
-	 * @param name
-	 * @param attr
-	 */
-	public void setAttr(String name, Object attr);
-	/**
-	 * Get an attribute of a block
-	 * @param name
-	 * @return
-	 */
-	public Object getAttr(String name);
-	
-	/**
-	 * Print IBlock information, include id, content, and successors
-	 */
-	public void print();
-}
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/ICallGraph.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/ICallGraph.java
deleted file mode 100644
index 60a0391..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/ICallGraph.java
+++ /dev/null

@@ -1,88 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis.cdt.graphs;
-
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
-
-/**
- * A call graph is a directed graph which represents the calling relation
- * among subroutines in a program. In CDT, it is partially determined
- * by static analysis.
- * 
- * @author Yuan Zhang
- *
- */
-public interface ICallGraph {
-	
-	/**
-	 * @return all functions in the call graph
-	 */
-	public List<ICallGraphNode> getAllNodes();
-	
-	/**
-	 * @return all global variables
-	 */
-	public List<String> getEnv();
-	
-	/**
-	 * @return one root function. A root function is never called by 
-	 * other functions. There may be multiple root functions in a call
-	 * graph. 
-	 */
-	public ICallGraphNode topEntry();
-	public void setTopEntry(ICallGraphNode node);
-	
-	/**
-	 * @return one leaf function. A leaf function never calls any other
-	 * functions. There may be multiple leaf functions in a call graph.
-	 */
-	public ICallGraphNode botEntry();
-	public void setBotEntry(ICallGraphNode node);
-	
-	/**
-	 * @return list of recursive function calls
-	 */
-	public List<List<ICallGraphNode>> getCycles();
-	
-	/**
-	 * Search for a function according to its filename and function name.
-	 * @param fileName
-	 * @param funcName
-	 * @return its call graph node if it is found; null otherwise.
-	 */
-	public ICallGraphNode getNode(String fileName, String funcName);
-	
-	/**
-	 * Search for a function according to its declaration.
-	 * @param fdef
-	 * @return its call graph node if it is found; null otherwise.
-	 */
-	public ICallGraphNode getNode(IASTFunctionDefinition fdef);
-	
-	/**
-	 * Add a function node to the call graph. Its calling relation
-	 * is not constructed yet.
-	 * @param node
-	 */
-	public void addNode(ICallGraphNode node);
-	
-	/**
-	 * Build the calling relations. This method is not reponsible for
-	 * collecting functions in a program.
-	 */
-	public void buildCG();
-	
-	public void print();
-	
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/ICallGraphNode.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/ICallGraphNode.java
deleted file mode 100644
index 3574662..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/ICallGraphNode.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis.cdt.graphs;
-
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
-import org.eclipse.core.resources.IResource;
-
-/**
- * A call graph node corresponds to a user-defined function.
- * 
- * @author Yuan Zhang
- *
- */
-public interface ICallGraphNode {
-	
-	/**
-	 * @return the function name
-	 */
-	public String getFuncName();
-	
-	/**
-	 * @return the enclosing file name
-	 */
-	public String getFileName();
-	
-	public IResource getResource();
-	
-	/**
-	 * @return the function declaration
-	 */
-	public IASTFunctionDefinition getFuncDef();
-	
-	/**
-	 * @return the set of functions that call this function
-	 */
-	public List<ICallGraphNode> getCallers();
-	public void addCaller(ICallGraphNode caller);
-	
-	/**
-	 * @return the set of functions that are called by this function
-	 */
-	public List<ICallGraphNode>	getCallees();
-	public void addCallee(ICallGraphNode callee);
-
-	/**
-	 * @return the control flow graph of this function
-	 */
-	public IControlFlowGraph getCFG();
-	public void setCFG(IControlFlowGraph cfg);
-	
-	/**
-	 * @return the next function according to the topological order
-	 */
-	public ICallGraphNode topNext();
-	public void setTopNext(ICallGraphNode node);
-	
-	/**
-	 * @return the next function according to the reverse topological order
-	 */
-	public ICallGraphNode botNext();
-	public void setBotNext(ICallGraphNode node);
-	
-	public void setAttr(String name, Object attr);
-	public Object getAttr(String name);
-	public void removeAttr(String name);
-	
-	public void setRecursive(boolean val);
-	public boolean isRecursive();
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/IControlFlowGraph.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/IControlFlowGraph.java
deleted file mode 100644
index ecc4449..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/IControlFlowGraph.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis.cdt.graphs;
-
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-
-/**
- * A control flow graph is directed graph. Each node is a block, and
- * each edge represents the jump in the control flow.
- * 
- * @author Yuan Zhang
- *
- */
-
-public interface IControlFlowGraph {
-
-	/**
-	 * @return the entry block
-	 */
-	public IBlock getEntry();
-	
-	/**
-	 * @return the exit block
-	 */
-	public IBlock getExit();
-	
-	
-	/** Search for the block which contains the statement <stmt>
-	 */
-	public IBlock getBlock(IASTStatement stmt);
-	/**
-	 * Search for the block which contains the condition expression
-	 * <expr>, and <expr> is the predicate of statement <parent>
-	 * @return
-	 */
-	public IBlock getBlock(IASTExpression expr, IASTStatement parent);
-	
-	/**
-	 * Search for the block which contains the <label> 
-	 * @return
-	 */
-	public IBlock getBlock(IASTName label);
-	
-	public void addBlock(IBlock bb);
-	
-	/**
-	 * Build the control flow relation
-	 */
-	public void buildCFG();
-	
-	public void print();
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/impl/Block.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/impl/Block.java
deleted file mode 100644
index bb320a0..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/impl/Block.java
+++ /dev/null

@@ -1,255 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,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.analysis.cdt.graphs.impl;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.IBlock;
-
-/**
- * 
- * @author Yuan Zhang
- *
- */
-public class Block implements IBlock {
-	protected List<IBlock> succs_;
-	protected List<IBlock> preds_;
-	protected IBlock topNext_ = null;
-	protected IBlock botNext_ = null;
-	protected List<IBlock> DOM_ = null;
-	protected List<IBlock> PDOM_ = null;
-	
-	protected static int counter = 0;
-	protected int id;
-	
-	/** "type" tells the type of the content in this block. 
-	 * A block with expr_type/stmt_type/label_type stores an 
-	 * expression/statement/labelname, respectively. A block
-	 * with continue_join_type is an empty block in a loop 
-	 * joining regular flows and flows from continue statements.
-	 * A block with exit_join_type is an empty block joining
-	 * (1) two branches of an if statement (2) all leaving
-	 * edges (through break or default statements) of a
-	 * switch statement (3) the regular exit from a loop and
-	 * irregular exits from break statements of this loop.  
-	 */
-	protected int type;
-	public static final int expr_type = 1;
-	public static final int stmt_type = 2;
-	public static final int label_type = 3;
-	public static final int continue_join_type = 4;
-	public static final int exit_join_type = 5;
-	
-	protected IASTNode content_;
-	
-	/** The parent of a block storing a statement is the statement itself;
-	 *  The parent of a block with a predicate expression is the corresponding
-	 *  if/loop/switch statement;
-	 *  The parent of a block with a label is the label statement;
-	 *  The parent of a block with continue_join_type or exit_join_type
-	 *  is the corresponding if/loop/switch statement;
-	 */
-	protected IASTStatement parent_;
-	
-	protected Hashtable<String,Object> attrs_;
-	
-	int color; // white = 0, gray = 1, black = 2
-	
-	public Block(){
-		id = counter ++;
-		type = 0;
-		content_ = null;
-		parent_ = null;
-		blockInit();
-	}
-
-	public Block(IASTNode content, IASTStatement parent, int type){
-		this();
-		content_ = content;
-		parent_ = parent;
-		this.type = type;
-		blockInit();
-	}
-	
-	/** Short-cut constructor for stmt_type block */
-	public Block(IASTStatement stmt){
-		this(stmt, stmt, stmt_type);
-	}
-	
-	/** Short-cut constructor for expr_type block */
-	public Block(IASTExpression expr, IASTStatement parent){
-		this(expr, parent, expr_type);
-	}
-	
-	/** Short-cut constructor for label_type block */
-	public Block(IASTName label){
-		this(label, null, label_type);
-	}
-	
-	protected void blockInit(){
-		succs_ = new ArrayList<IBlock>();
-		preds_ = new ArrayList<IBlock>();
-		DOM_ = new ArrayList<IBlock>();
-		PDOM_ = new ArrayList<IBlock>();
-		attrs_ = new Hashtable<String,Object>();
-	}
-
-	public int getID(){
-		return id;
-	}
-	
-	public IASTNode getContent(){
-		return content_;
-	}
-	
-	public IASTStatement getParent(){
-		return parent_;
-	}
-	public int getType() {return type;}
-
-	public boolean search(IASTNode content, IASTStatement parent, int type){
-		if(this.type != type) return false;
-		if(type == stmt_type){
-			if(content == content_) return true;
-			else return false;
-		}
-		else if(type == label_type){
-			if(content instanceof IASTName){
-				IASTName name = (IASTName)content;
-				IASTName labelName = (IASTName)content_;
-				if(name.toString().equals(labelName.toString()))
-					return true;
-				else return false;
-			}
-			else return false;
-		}
-		else if(type == expr_type){
-			if(content != null && content == content_) return true;
-			if(content == null && content_ == null && parent_ == parent) 
-				return true;
-			else return false;
-		}
-		else if(type == continue_join_type || type == exit_join_type){
-			if(content != null) return false;
-			if(parent == parent_) return true;
-			else return false;
-		}
-		else return false;
-	}
-
-	public boolean search(IASTExpression expr, IASTStatement parent){
-		return search(expr, parent, expr_type);
-	}
-	
-	public boolean search(IASTStatement stmt){
-		return search(stmt, stmt, stmt_type);
-	}
-	
-	public boolean search(IASTName label){
-		return search(label, null, label_type);
-	}
-	
-	public IBlock topNext() {
-		return topNext_;
-	}
-	public IBlock getTopNext() {
-		return topNext_;
-	}
-	public void setTopNext(IBlock b){
-		topNext_ = b;
-	}
-	
-	public IBlock botNext() {
-		return botNext_;
-	}
-	public IBlock getBotNext() {
-		return botNext_;
-	}
-	public void setBotNext(IBlock b){
-		botNext_ = b;
-	}
-	
-	public List<IBlock> getPreds() {
-		return preds_;
-	}
-
-	public List<IBlock> getSuccs() {
-		return succs_;
-	}
-	
-	public List<IBlock> getDOM(){
-		return DOM_;
-	}
-	
-	public void setDOM(List<IBlock> set){
-		DOM_ = set;
-	}
-	
-	public List<IBlock> getPDOM(){
-		return PDOM_;
-	}
-	
-	public void setPDOM(List<IBlock> set){
-		PDOM_ = set;
-	}
-
-	public void setAttr(String name, Object attr){
-		attrs_.put(name, attr);
-	}
-	
-	public Object getAttr(String name){
-		return attrs_.get(name);
-	}
-	
-	/**
-	 * Print IBlock information, include id, content (type & raw signature), and successors
-	 */
-	public void print(){
-		System.out.println(toString());
-	}
-	public String toString(){
-		StringBuffer buf = new StringBuffer();
-		buf.append("Block " + id + ": "); //$NON-NLS-1$ //$NON-NLS-2$
-		IASTNode content = getContent();
-		if(content != null) {
-			String type=content.toString(); // a.b.c.Name@abcd
-			type = type.substring(type.lastIndexOf('.')+1);  // Name@abcd
-			type=type.substring(0,type.indexOf('@'));
-			buf.append("  "+type+"  "+content.getRawSignature()+"\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		}
-		else {
-			buf.append("  Empty block"); //$NON-NLS-1$
-			buf.append("\n"); //$NON-NLS-1$
-		}
-		buf.append("  flows to: "); //$NON-NLS-1$
-		for(Iterator<IBlock> i = succs_.iterator(); i.hasNext();){
-			buf.append(i.next().getID() + ", "); //$NON-NLS-1$
-		}
-		buf.append(" \n"); //$NON-NLS-1$
-		/*
-		System.out.print("Dominator: ");
-		for(Iterator i = DOM_.iterator(); i.hasNext();){
-			Block dom = (Block)i.next();
-			System.out.print(dom.getID() + ", ");
-		}
-		System.out.println(" ");
-		*/
-		return buf.toString();
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/impl/CallGraph.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/impl/CallGraph.java
deleted file mode 100644
index 914cfdd..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/impl/CallGraph.java
+++ /dev/null

@@ -1,309 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis.cdt.graphs.impl;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Stack;
-
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionCallExpression;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraph;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraphNode;
-
-public class CallGraph implements ICallGraph {
-	/**list of call graph nodes */
-	protected List<ICallGraphNode> nodes_;
-	/**list of global variable names*/
-	protected List<String> env_; 
-	
-	/** the entry node according to topological order */
-	protected ICallGraphNode topEntry_;
-	/** the entry node according to the reverse topological order */
-	protected ICallGraphNode botEntry_;
-	/** list of cycles in the call graph */
-	protected List<List<ICallGraphNode>> cycles_;
-	
-	public CallGraph(){
-		nodes_ = new ArrayList<ICallGraphNode>();
-		env_ = new ArrayList<String>();
-		topEntry_ = null;
-		botEntry_ = null;
-		cycles_ = new ArrayList<List<ICallGraphNode>>();
-	}
-	
-	public void addNode(ICallGraphNode node) {
-		for(Iterator<ICallGraphNode> i = nodes_.iterator(); i.hasNext();){
-			ICallGraphNode n = i.next();
-			if(n.getFuncName().equals(node.getFuncName()) && 
-					n.getFileName().equals(node.getFileName()))
-				return;
-		}
-		nodes_.add(node);
-	}
-
-	public List<ICallGraphNode> getAllNodes() {
-		return nodes_;
-	}
-
-	public ICallGraphNode botEntry() {
-		return botEntry_;
-	}
-
-	public List<List<ICallGraphNode>> getCycles() {
-		return cycles_;
-	}
-
-	/** @return the enclosing function of an AST node */
-	protected ICallGraphNode getEnclosingFunc(IASTNode n) {
-		IASTNode parent = n.getParent();
-		while(parent != null){
-			if(parent instanceof IASTFunctionDefinition)
-				return getNode((IASTFunctionDefinition)parent);
-			parent = parent.getParent();
-		}
-		return null;
-	}
-	
-	public List<String> getEnv() {
-		return env_;
-	}
-
-	/** @return the call graph node with the function name "funcName".
-	 * If there are more than one functions with the same name (but
-	 * with different scopes), and there is one such function in the
-	 * file "fileName", then return this function node */
-	public ICallGraphNode getNode(String fileName, String funcName) {
-		ICallGraphNode tmp = null;
-		for(Iterator<ICallGraphNode> i = nodes_.iterator(); i.hasNext();){
-			ICallGraphNode node = i.next();
-			if(node.getFuncName().equals(funcName)){
-				tmp = node;
-				if(node.getFileName().equals(fileName))
-					return node;
-			}
-		}
-		return tmp;
-	}
-
-	public ICallGraphNode getNode(IASTFunctionDefinition fdef) {
-		for(Iterator<ICallGraphNode> i = nodes_.iterator(); i.hasNext();){
-			ICallGraphNode node = i.next();
-			if(node.getFuncDef() == fdef)
-				return node;
-		}
-		return null;
-	}
-
-	public ICallGraphNode topEntry() {
-		return topEntry_;
-	}
-
-	public void setBotEntry(ICallGraphNode node) {
-		botEntry_ = node;
-	}
-
-	public void setTopEntry(ICallGraphNode node) {
-		topEntry_ = node;
-	}
-	
-	/** Constructing the call graph consists of three steps:
-	 *  (1) calculating caller and callee relations among functions. 
-	 *  Note that call graph nodes have been collected before 
-	 *  constructing the call graph
-	 *  (2) check the recursive function calls and collecting all cycles
-	 *  (3) other options for future extension
-	 */
-	public void buildCG(){
-		CGBuilder builder = new CGBuilder();
-		builder.run();
-		checkRecursive();
-		otherOP();
-	}
-
-	class CGBuilder extends ASTVisitor{
-		ICallGraphNode currentNode_;
-		
-		public void run()
-		{
-			this.shouldVisitExpressions = true;
-			this.shouldVisitStatements = true;
-			this.shouldVisitDeclarations = true;
-			
-			for(Iterator<ICallGraphNode> i = nodes_.iterator(); i.hasNext();){
-				currentNode_ = i.next();
-				IASTFunctionDefinition func = currentNode_.getFuncDef();
-				func.accept(this);
-				ICallGraphNode enclosingFuncNode = getEnclosingFunc(func);
-				if(enclosingFuncNode != null){ 
-					// fd is nested declared function
-					enclosingFuncNode.addCallee(currentNode_);
-					currentNode_.addCaller(enclosingFuncNode);
-				}
-			}
-		}
-		
-		public int visit(IASTExpression expression) 
-		{
-			if (expression instanceof IASTFunctionCallExpression) {
-				IASTFunctionCallExpression funcExpr = (IASTFunctionCallExpression)expression;
-				IASTExpression funcname = funcExpr.getFunctionNameExpression();
-				String signature = funcname.getRawSignature();
-				//System.out.println(signature);
-				ICallGraphNode fnode = getNode(currentNode_.getFileName(), signature);
-				if (fnode != null){ 
-					/* This is a user-defined function call */
-					currentNode_.addCallee(fnode);
-					fnode.addCaller(currentNode_);
-				}
-			}
-			return PROCESS_CONTINUE;
-		}
-	}
-		
-	protected Stack<ICallGraphNode> order;
-	
-	public void checkRecursive(){
-		order = new Stack<ICallGraphNode>();
-		DFS();
-		RV_DFS();
-		
-		Hashtable<ICallGraphNode,List<ICallGraphNode>> recursions = 
-			new Hashtable<ICallGraphNode,List<ICallGraphNode>>();
-		for(ICallGraphNode node = botEntry_; node != null; node = node.botNext()){
-			ICallGraphNode pi = (ICallGraphNode)node.getAttr("pi"); //$NON-NLS-1$
-			if(pi != null){
-				if(recursions.containsKey(pi)){
-					List<ICallGraphNode> list = recursions.get(pi);
-					list.add(node);
-				} else {
-					List<ICallGraphNode> list = new ArrayList<ICallGraphNode>();
-					list.add(node);
-					recursions.put(pi, list);
-				}
-			}
-		}
-		for(Enumeration<ICallGraphNode> e = recursions.keys(); e.hasMoreElements();){
-			ICallGraphNode root = e.nextElement();
-			List<ICallGraphNode> list = recursions.get(root);
-			if(!list.contains(root)) 
-				list.add(root);
-			cycles_.add(list);
-			for(Iterator<ICallGraphNode> i = list.iterator(); i.hasNext();){
-				i.next().setRecursive(true);
-			}
-		}
-		for(Iterator<ICallGraphNode> i = nodes_.iterator(); i.hasNext();){
-			ICallGraphNode node = i.next();
-			if(node.getCallees().contains(node)){ //self-recursion
-				List<ICallGraphNode> list = new ArrayList<ICallGraphNode>();
-				list.add(node);
-				cycles_.add(list);
-				node.setRecursive(true);
-			}
-		}
-	}
-	
-	protected void DFS(){
-		for(Iterator<ICallGraphNode> i = nodes_.iterator(); i.hasNext();){
-			ICallGraphNode node = i.next();
-			node.setAttr("color", new Integer(0)); //$NON-NLS-1$
-			node.removeAttr("pi"); //$NON-NLS-1$
-		}
-		for(Iterator<ICallGraphNode> i = nodes_.iterator(); i.hasNext();){
-			ICallGraphNode node = i.next();
-			int color = ((Integer)node.getAttr("color")).intValue(); //$NON-NLS-1$
-			if(color == 0)
-				DFSVisit(node);
-		}
-	}
-	
-	protected void DFSVisit(ICallGraphNode node){
-		node.setAttr("color", new Integer(1)); //$NON-NLS-1$
-		for(Iterator<ICallGraphNode> i = node.getCallees().iterator(); i.hasNext();){
-			ICallGraphNode callee = i.next();
-			int color = ((Integer)callee.getAttr("color")).intValue(); //$NON-NLS-1$
-			if(color == 0){ //white
-				callee.setAttr("pi", node); //$NON-NLS-1$
-				DFSVisit(callee);
-			}
-		}
-		order.push(node);
-	}
-	
-	protected void RV_DFS(){
-		for(Iterator<ICallGraphNode> i = nodes_.iterator(); i.hasNext();){
-			ICallGraphNode node = i.next();
-			node.setAttr("color", new Integer(0)); //$NON-NLS-1$
-			node.removeAttr("pi"); //$NON-NLS-1$
-		}
-		
-		ICallGraphNode n = null;
-		ICallGraphNode m = null;
-		topEntry_ = order.peek();
-		while(!order.empty()){
-			n = order.pop();
-			n.setBotNext(m);
-			if(m != null) m.setTopNext(n);
-			m = n;
-			int color = ((Integer)n.getAttr("color")).intValue(); //$NON-NLS-1$
-			if(color == 0){
-				RV_DFSVisit(n);
-			}
-		}
-		botEntry_ = m;
-		
-		for(n = botEntry_; n != null; n = n.botNext()){
-			ICallGraphNode pred = (ICallGraphNode)n.getAttr("pi"); //$NON-NLS-1$
-			ICallGraphNode temp = null;
-			while(pred != null){
-				temp = pred;
-				pred = (ICallGraphNode)pred.getAttr("pi"); //$NON-NLS-1$
-			}
-			if(temp != null) n.setAttr("pi", temp); //$NON-NLS-1$
-		}
-	}
-	
-	protected void RV_DFSVisit(ICallGraphNode node){
-		node.setAttr("color", new Integer(1)); //$NON-NLS-1$
-		for(Iterator<ICallGraphNode> i = node.getCallers().iterator(); i.hasNext();){
-			ICallGraphNode caller = i.next();
-			int color = ((Integer)caller.getAttr("color")).intValue(); //$NON-NLS-1$
-			if(color == 0){ //white
-				caller.setAttr("pi", node); //$NON-NLS-1$
-				RV_DFSVisit(caller);
-			}
-		}
-	}
-	
-	public void otherOP(){
-	}
-	
-	public void print(){
-		for(Iterator<ICallGraphNode> i=nodes_.iterator(); i.hasNext();){
-			ICallGraphNode node = i.next();
-			System.out.print(node.getFuncName() + " calls: "); //$NON-NLS-1$
-			for(Iterator<ICallGraphNode> ii = node.getCallees().iterator(); ii.hasNext();){
-				ICallGraphNode callee = ii.next();
-				System.out.println(callee.getFuncName() + ", "); //$NON-NLS-1$
-			}
-			System.out.println(""); //$NON-NLS-1$
-			System.out.println(""); //$NON-NLS-1$
-		}
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/impl/CallGraphNode.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/impl/CallGraphNode.java
deleted file mode 100644
index 11bf50d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/impl/CallGraphNode.java
+++ /dev/null

@@ -1,163 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.impl;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraphNode;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.IControlFlowGraph;
-
-/**
- * Implementation of a call graph node, which represents a user-defined
- * function
- *
- */
-public class CallGraphNode implements ICallGraphNode {
-	protected IResource resource_;
-	protected String fileName_;
-	protected String funcName_;
-	protected IASTFunctionDefinition fdef_;
-	protected List<ICallGraphNode> callers_;
-	protected List<ICallGraphNode> callees_;
-	protected boolean nested; //nested function declaration?
-	protected IControlFlowGraph CFG_;
-	
-	/** next node in reverse-topological (bottom-up) order */
-	protected ICallGraphNode botNext_;
-	/** next node in topological (top-down) order */
-	protected ICallGraphNode topNext_; 
-	protected Hashtable<String,Object> attrs_;
-
-	protected boolean recursive;
-	
-	public CallGraphNode(IResource resource, String filename, 
-				String funcname, IASTFunctionDefinition fdef){
-		resource_ = resource;
-		fileName_ = filename;
-		funcName_ = funcname;
-		fdef_ = fdef;
-		init();
-	}
-	
-	public CallGraphNode(IResource resource, String filename, 
-				IASTFunctionDefinition fdef){
-		resource_ = resource;
-		fileName_ = filename;
-		fdef_ = fdef;
-		funcName_ = getFuncName(fdef);	
-		init();
-	}
-	
-	private void init(){
-		callers_ = new ArrayList<ICallGraphNode>();
-		callees_ = new ArrayList<ICallGraphNode>();
-		nested = false;
-		CFG_ = null; 
-		topNext_ = null;
-		botNext_ = null;
-		attrs_ = new Hashtable<String,Object>();
-		recursive = false;
-	}
-	
-	private String getFuncName(IASTFunctionDefinition fdef){
-		IASTDeclarator fdecl = (IASTDeclarator)fdef.getDeclarator();
-		return new String(((IASTName)fdecl.getName()).toCharArray());
-	}
-	
-	public String getFuncName(){
-		return funcName_;
-	}
-	
-	public String getFileName(){
-		return fileName_;
-	}
-	
-	public IResource getResource(){
-		return resource_;
-	}
-	
-	public IASTFunctionDefinition getFuncDef(){
-		return fdef_;
-	}
-	
-	public boolean isNested(){
-		return nested;
-	}
-	
-	public List<ICallGraphNode> getCallers(){
-		return callers_;
-	}
-	
-	public void addCaller(ICallGraphNode caller){
-		if(!callers_.contains(caller))
-			callers_.add(caller);
-	}
-	
-	public List<ICallGraphNode>	getCallees(){
-		return callees_;
-	}
-	
-	public void addCallee(ICallGraphNode callee){
-		if(!callees_.contains(callee))
-			callees_.add(callee);
-	}
-	/** Returns next node in reverse-topological (bottom-up) order */
-	public ICallGraphNode botNext() {
-		return botNext_;
-	}
-
-	public void setBotNext(ICallGraphNode node){
-		botNext_ = node;
-	}
-	
-	public IControlFlowGraph getCFG() {
-		return CFG_;
-	}
-	/** Returns next node in topological (top-down) order */
-	public ICallGraphNode topNext() {
-		return topNext_;
-	}
-
-	public void setTopNext(ICallGraphNode node){
-		topNext_ = node;
-	}
-	
-	public void setCFG(IControlFlowGraph cfg) {
-		CFG_ = cfg;
-	}
-	
-	public void setAttr(String name, Object attr){
-		attrs_.put(name, attr);
-	}
-	public Object getAttr(String name){
-		return attrs_.get(name);
-	}
-	
-	public void removeAttr(String name){
-		attrs_.remove(name);
-	}
-	
-	public void setRecursive(boolean val){
-		recursive = val;
-	}
-	
-	public boolean isRecursive(){
-		return recursive;
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/impl/ControlFlowGraph.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/impl/ControlFlowGraph.java
deleted file mode 100644
index 07b3446..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/impl/ControlFlowGraph.java
+++ /dev/null

@@ -1,820 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.impl;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Stack;
-
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTBreakStatement;
-import org.eclipse.cdt.core.dom.ast.IASTCaseStatement;
-import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement;
-import org.eclipse.cdt.core.dom.ast.IASTContinueStatement;
-import org.eclipse.cdt.core.dom.ast.IASTDeclarationStatement;
-import org.eclipse.cdt.core.dom.ast.IASTDefaultStatement;
-import org.eclipse.cdt.core.dom.ast.IASTDoStatement;
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTExpressionStatement;
-import org.eclipse.cdt.core.dom.ast.IASTForStatement;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionCallExpression;
-import org.eclipse.cdt.core.dom.ast.IASTGotoStatement;
-import org.eclipse.cdt.core.dom.ast.IASTIfStatement;
-import org.eclipse.cdt.core.dom.ast.IASTLabelStatement;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTNullStatement;
-import org.eclipse.cdt.core.dom.ast.IASTProblemStatement;
-import org.eclipse.cdt.core.dom.ast.IASTReturnStatement;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.cdt.core.dom.ast.IASTSwitchStatement;
-import org.eclipse.cdt.core.dom.ast.IASTWhileStatement;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.IBlock;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.IControlFlowGraph;
-
-/**
- * Control Flow Graph implementation
- * 
- * @author Yuan Zhang
- *
- */
-
-public class ControlFlowGraph implements IControlFlowGraph {
-	protected IASTStatement prog_;
-	protected List<IBlock> BBs_;
-	protected IBlock entry_;
-	protected IBlock exit_;
-	private static final boolean traceOn = false;
-	
-	public ControlFlowGraph(IASTStatement prog){
-		this.prog_ = prog;
-		BBs_ = new ArrayList<IBlock>();
-	}
-
-	/** Constructing a CFG consists of several steps:
-	 * Step 1: collecting all blocks in a function
-	 * Step 2: calculating control flows among blocks
-	 * Step 3: calculating dominator and post-dominator relations
-	 * Step 4: Sort all blocks according to the topological order
-	 * Step 5: Other additional operations
-	 */
-	public void buildCFG(){
-		collectBlocks();
-		setBlockFlow();
-		buildDOM();
-		buildPDOM();
-		sort();
-		otherOPs();
-	}
-	
-	/** Collecting all blocks in a function */
-	protected void collectBlocks(){
-		entry_ = new Block();
-		exit_ = new Block();
-		BasicBlockCollector bc = new BasicBlockCollector();
-		bc.run();
-	}
-	
-	/** Calculating control flows among blocks */
-	protected void setBlockFlow(){
-		FlowBuilder flowBuilder = new FlowBuilder();
-		flowBuilder.run();
-	}
-	
-	class BasicBlockCollector extends ASTVisitor{
-
-		public void run(){
-			this.shouldVisitStatements = true;
-			this.shouldVisitDeclarations = true;
-			prog_.accept(this);
-		}
-		
-		public int visit(IASTStatement stmt) 
-		{
-			IBlock block;
-			if(stmt instanceof IASTBreakStatement){
-				block = new Block(stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTCaseStatement){
-				block = new Block(stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTCompoundStatement){
-			} 
-			else if(stmt instanceof IASTContinueStatement){
-				block = new Block(stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTDeclarationStatement){
-				block = new Block(stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTDefaultStatement){
-				block = new Block(stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTDoStatement){
-				IASTDoStatement doStmt = (IASTDoStatement)stmt;
-				block = new Block(doStmt.getCondition(), stmt);
-				addBlock(block);
-				IBlock exitjoin = new Block(null, stmt, Block.exit_join_type);
-				addBlock(exitjoin);
-				IBlock continuejoin = new Block(null, stmt, Block.continue_join_type);
-				addBlock(continuejoin);
-			} 
-			else if(stmt instanceof IASTExpressionStatement){
-				block = new Block(stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTForStatement){
-				IASTForStatement forStmt = (IASTForStatement)stmt;
-				/* The initialization is a statement, and will be added later */
-				block = new Block(forStmt.getConditionExpression(), stmt);
-				addBlock(block);
-				if(forStmt.getIterationExpression() != null){
-					block = new Block(forStmt.getIterationExpression(), stmt);
-					addBlock(block);
-				}
-				IBlock continuejoin = new Block(null, stmt, Block.continue_join_type);
-				addBlock(continuejoin);
-				IBlock exitjoin = new Block(null, stmt, Block.exit_join_type);
-				addBlock(exitjoin);
-			} 
-			else if(stmt instanceof IASTGotoStatement){
-				block = new Block(stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTIfStatement){
-				IASTIfStatement ifStmt = (IASTIfStatement)stmt;
-				block = new Block(ifStmt.getConditionExpression(), stmt);
-				addBlock(block);
-				IBlock join = new Block(null, stmt, Block.exit_join_type);
-				addBlock(join);
-			} 
-			else if(stmt instanceof IASTLabelStatement){
-				IASTLabelStatement labelS = (IASTLabelStatement)stmt;
-				block = new Block(labelS.getName(), stmt, Block.label_type);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTNullStatement){
-				block = new Block(stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTProblemStatement){
-				block = new Block(stmt);
-				addBlock(block);
-			}
-			else if(stmt instanceof IASTReturnStatement){
-				IASTReturnStatement rtStmt = (IASTReturnStatement)stmt;
-				block = new Block(rtStmt.getReturnValue(), stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTSwitchStatement){
-				IASTSwitchStatement swStmt = (IASTSwitchStatement)stmt;
-				block = new Block(swStmt.getControllerExpression(), stmt);
-				addBlock(block);
-				IBlock join = new Block(null, stmt, Block.exit_join_type);
-				addBlock(join);
-			} 
-			else if(stmt instanceof IASTWhileStatement){
-				IASTWhileStatement whStmt = (IASTWhileStatement)stmt;
-				block = new Block(whStmt.getCondition(), stmt);
-				addBlock(block);
-				IBlock join = new Block(null, stmt, Block.continue_join_type);
-				addBlock(join);
-				IBlock exitjoin = new Block(null, stmt, Block.exit_join_type);
-				addBlock(exitjoin);
-			} 
-			return PROCESS_CONTINUE;
-		}
-	}
-	
-	public class FlowBuilder extends ASTVisitor{		
-		private boolean exitBlock = false;
-		
-		public void run(){
-			this.shouldVisitStatements = true;
-			this.shouldVisitDeclarations = true;
-			this.shouldVisitTranslationUnit = true;
-			this.shouldVisitExpressions = true;
-			IBlock first = firstBlock(prog_);
-			ControlFlowEdge(entry_, first);
-			prog_.accept(this);
-		}
-		
-		public int visit(IASTStatement stmt){
-			if(stmt instanceof IASTBreakStatement){
-				/** A break statement flows to a block with exit_join_type */
-				if(traceOn) System.out.println("BreakStatement"); //$NON-NLS-1$
-				IBlock block = getBlock(stmt);
-				IASTNode parent = stmt.getParent();
-				while(true){
-					if(parent instanceof IASTDoStatement ||
-						parent instanceof IASTForStatement ||
-						parent instanceof IASTWhileStatement ||
-						parent instanceof IASTSwitchStatement){
-						IBlock exitjoin = getBlock(null, (IASTStatement)parent,
-								Block.exit_join_type);
-						ControlFlowEdge(block, exitjoin);
-						break;
-					}
-					else{
-						parent = parent.getParent();
-					}
-				}
-			} 
-			else if(stmt instanceof IASTCaseStatement || 
-					stmt instanceof IASTDefaultStatement){
-				/** A case(default) statement flows from the switch 
-				 * condition block or the previous case statement, and 
-				 * flows to the first statement in the case(default) body.
-				 */
-				if(traceOn) System.out.println("CaseStatement / DefaultStatement"); //$NON-NLS-1$
-				IASTNode parent = stmt.getParent();
-				while(true){
-					if(parent instanceof IASTSwitchStatement) break;
-					else parent = parent.getParent();
-				}
-				IASTSwitchStatement swStmt = (IASTSwitchStatement)parent;
-				IBlock swblock = getBlock(swStmt.getControllerExpression(), 
-									(IASTStatement)parent);
-				IBlock caseblock = getBlock(stmt);
-				ControlFlowEdge(swblock, caseblock);
-				IBlock next = nextBlock(stmt);
-				ControlFlowEdge(caseblock, next);
-			} 
-			else if(stmt instanceof IASTCompoundStatement){
-			} 
-			else if(stmt instanceof IASTContinueStatement){
-				/** A continue statement flows to the continue_join_type block */
-				if(traceOn) System.out.println("ContinueStatement"); //$NON-NLS-1$
-				IBlock block = getBlock(stmt);
-				IASTNode parent = stmt.getParent();
-				while(true){
-					if(parent instanceof IASTDoStatement ||
-							parent instanceof IASTForStatement ||
-							parent instanceof IASTWhileStatement){
-						IBlock continuejoin = getBlock(null, (IASTStatement)parent, 
-								Block.continue_join_type);
-						ControlFlowEdge(block, continuejoin);
-						break;
-					}
-					else{
-						parent = parent.getParent();
-					}
-				}
-			} 
-			else if(stmt instanceof IASTDeclarationStatement){
-				/** Except the regular variable declaration statements, the
-				 * initializer of a for statement could also be a
-				 * declaration statement. In the latter case, the flow
-				 * relation is already calculated and therefore nothing
-				 * is done here. */
-				if(traceOn) System.out.println("DeclarationStatement"); //$NON-NLS-1$
-				IASTNode parent = stmt.getParent();
-				if(parent instanceof IASTForStatement){
-					IASTForStatement forStmt = (IASTForStatement)parent;
-					if(forStmt.getInitializerStatement() == stmt)
-						return PROCESS_CONTINUE;
-				}
-				IBlock block = getBlock(stmt);
-				IBlock next = nextBlock(stmt);
-				ControlFlowEdge(block, next);
-			} 
-			else if(stmt instanceof IASTDoStatement){
-				/** We calculate four types of control flows here:
-				 * (1) the condition block flows to the first block of the loop body
-				 * (2) the condition block flows to the exit_join_type block
-				 * (3) the continue_join_type block flows to the condition block
-				 * (4) the exit_join_type block flows to the next statement after
-				 * this do loop
-				 */
-				if(traceOn) System.out.println("DoStatement"); //$NON-NLS-1$
-				IASTDoStatement doStmt = (IASTDoStatement)stmt;
-				IBlock cond = getBlock(doStmt.getCondition(), stmt);
-				if(doStmt.getBody() == null){
-					ControlFlowEdge(cond, cond);
-				} else {
-					IBlock first = firstBlock(doStmt.getBody());
-					ControlFlowEdge(cond, first);
-					IBlock continuejoin = getBlock(null, stmt, Block.continue_join_type);
-					ControlFlowEdge(continuejoin, cond);
-				}
-				IBlock exitjoin = getBlock(null, stmt, Block.exit_join_type);
-				ControlFlowEdge(cond, exitjoin);
-				IBlock next = nextBlock(stmt);
-				ControlFlowEdge(exitjoin, next);
-			} 
-			else if(stmt instanceof IASTExpressionStatement){
-				/** If the expression statement is the initializer of a for
-				 * loop, do nothing here. If this statement contains an
-				 * "exit" function call, it flows to the exit block of the
-				 * current function */
-				if(traceOn) System.out.println("ExpressionSatement"); //$NON-NLS-1$
-				IASTNode parent = stmt.getParent();
-				if(parent instanceof IASTForStatement){
-					IASTForStatement forStmt = (IASTForStatement)parent;
-					if(forStmt.getInitializerStatement() == stmt)
-						return PROCESS_CONTINUE;
-				}
-				IBlock block = getBlock(stmt);
-				IASTExpressionStatement exprStmt = (IASTExpressionStatement)stmt;
-				exitBlock = false;
-				exprStmt.getExpression().accept(this);
-				if(exitBlock){
-					ControlFlowEdge(block, exit_);
-				}
-				else {
-					IBlock next = nextBlock(stmt);
-					ControlFlowEdge(block, next);
-				}
-			} 
-			else if(stmt instanceof IASTForStatement){
-				/** In a for loop, the initializer flows to the loop condition,
-				 * the loop condition flows to the first statement in the loop
-				 * body and the block with exit_join_type. The continue_join_type
-				 * block flows to the iterator, and the iterator flows to the
-				 * condition block */
-				if(traceOn) System.out.println("ForStatement"); //$NON-NLS-1$
-				IASTForStatement forStmt = (IASTForStatement)stmt;
-				IASTStatement initStmt = forStmt.getInitializerStatement();
-				IBlock init = getBlock(initStmt);
-				IBlock cond = getBlock(forStmt.getConditionExpression(), stmt);
-				IBlock iter = null;
-				IBlock continuejoin = getBlock(null, stmt, Block.continue_join_type);
-				IBlock exitjoin = getBlock(null, stmt, Block.exit_join_type);
-				
-				if(forStmt.getIterationExpression() != null)
-					iter = getBlock(forStmt.getIterationExpression(), stmt);
-				
-				/* The empty initialization will be a Null statement */
-				ControlFlowEdge(init, cond);
-				
-				if(forStmt.getBody() != null){
-					IBlock first = firstBlock(forStmt.getBody());
-					ControlFlowEdge(cond, first);
-					if(iter != null){
-						ControlFlowEdge(continuejoin, iter);
-						ControlFlowEdge(iter, cond);
-					} else
-						ControlFlowEdge(continuejoin, cond);
-				} else {
-					if(iter != null){
-						ControlFlowEdge(cond, iter);
-						ControlFlowEdge(iter, cond);
-					} else {
-						ControlFlowEdge(cond, cond);
-					}
-				}		
-				ControlFlowEdge(cond, exitjoin);
-				IBlock next = nextBlock(stmt);
-				ControlFlowEdge(exitjoin, next);
-			} 
-			else if(stmt instanceof IASTGotoStatement){
-				/** Goto statement flows to the corresponding label statement */
-				if(traceOn) System.out.println("GotoStatement"); //$NON-NLS-1$
-				IASTGotoStatement gotoStmt = (IASTGotoStatement)stmt;
-				IBlock label = getBlock(gotoStmt.getName(), gotoStmt, Block.label_type);
-				if(label == null){
-					System.out.println("Null Label Error"); //$NON-NLS-1$
-				}
-				IBlock block = getBlock(gotoStmt);
-				ControlFlowEdge(block, label);
-			} 
-			else if(stmt instanceof IASTIfStatement){
-				/** The if condition block flows to the first block of the 
-				 * then(else) clause if it is not empty, the exit_join_type
-				 * block otherwise */
-				if(traceOn) System.out.println("IfStatement"); //$NON-NLS-1$
-				IASTIfStatement ifStmt = (IASTIfStatement)stmt;
-				IBlock condb = getBlock(ifStmt.getConditionExpression(), stmt);
-				IBlock join = getBlock(null, stmt, Block.exit_join_type);
-				if(ifStmt.getThenClause() != null){
-					IBlock thenb = firstBlock(ifStmt.getThenClause());
-					ControlFlowEdge(condb, thenb);
-				} else {
-					ControlFlowEdge(condb, join);
-				}
-				
-				if(ifStmt.getElseClause() != null){
-					IBlock elseb = firstBlock(ifStmt.getElseClause());
-					ControlFlowEdge(condb, elseb);
-				} else {
-					ControlFlowEdge(condb, join);
-				}
-				IBlock next = nextBlock(stmt);
-				ControlFlowEdge(join, next);
-			} 
-			else if(stmt instanceof IASTLabelStatement){
-				/** If there is a nested statement, the label statement flows
-				 * to the first block of the nested statement
-				 */
-				if(traceOn) System.out.println("LabelStatement"); //$NON-NLS-1$
-				IASTLabelStatement label = (IASTLabelStatement)stmt;
-				IBlock block = getBlock(label.getName(), stmt, Block.label_type);
-				if(label.getNestedStatement() == null){
-					IBlock next = nextBlock(stmt);
-					ControlFlowEdge(block, next);
-				} else {
-					IBlock next = firstBlock(label.getNestedStatement());
-					ControlFlowEdge(block, next);
-				}
-			} 
-			else if(stmt instanceof IASTNullStatement){
-				if(traceOn) System.out.println("NullStatement"); //$NON-NLS-1$
-				IASTNode parent = stmt.getParent();
-				if(parent instanceof IASTForStatement){
-					IASTForStatement forStmt = (IASTForStatement)parent;
-					if(forStmt.getInitializerStatement() == stmt)
-						return PROCESS_CONTINUE;
-				}
-				IBlock block = getBlock(stmt);
-				IBlock next = nextBlock(stmt);
-				ControlFlowEdge(block, next);
-			}
-			else if(stmt instanceof IASTProblemStatement){
-				if(traceOn) System.out.println("ProblemStatement"); //$NON-NLS-1$
-				IBlock block = getBlock(stmt);
-				IBlock next = nextBlock(stmt);
-				ControlFlowEdge(block, next);
-			}
-			else if(stmt instanceof IASTReturnStatement){
-				/* The return statement flows to the exit block */
-				if(traceOn) System.out.println("ReturnStatement"); //$NON-NLS-1$
-				IASTReturnStatement rtStmt = (IASTReturnStatement)stmt;
-				IBlock rv = getBlock(rtStmt.getReturnValue(), stmt);
-				ControlFlowEdge(rv, exit_);
-			} 
-			else if(stmt instanceof IASTSwitchStatement){
-				/** The exit_join block of a switch statement flows to the
-				 * first block of the next statement
-				 */
-				if(traceOn) System.out.println("SwitchStatement"); //$NON-NLS-1$
-				IBlock join = getBlock(null, stmt, Block.exit_join_type);
-				IBlock next = nextBlock(stmt);
-				ControlFlowEdge(join, next);
-			} 
-			else if(stmt instanceof IASTWhileStatement){
-				/** The condition block of a while loop flows to the first
-				 * statement in the loop body and the exit_join block. 
-				 * The condition_join block flows to the condition block.
-				 */
-				if(traceOn) System.out.println("WhileStatement"); //$NON-NLS-1$
-				IASTWhileStatement whStmt = (IASTWhileStatement)stmt;
-				IBlock cond = getBlock(whStmt.getCondition(), stmt);
-				IBlock continuejoin = getBlock(null, stmt, Block.continue_join_type);
-				IBlock exitjoin = getBlock(null, stmt, Block.exit_join_type);
-				if(whStmt.getBody() == null){
-					ControlFlowEdge(cond, cond);
-				} else {
-					IBlock first = firstBlock(whStmt.getBody());
-					ControlFlowEdge(cond, first);
-					ControlFlowEdge(continuejoin, cond);
-				}
-				IBlock next = nextBlock(stmt);
-				ControlFlowEdge(cond, exitjoin);
-				ControlFlowEdge(exitjoin, next);
-			}
-			return PROCESS_CONTINUE;
-		}
-		
-		/*
-		 * @return the first block of stmt
-		 */
-		public IBlock firstBlock(IASTStatement stmt){
-			
-			if(stmt instanceof IASTBreakStatement){	
-				return getBlock(stmt);
-			} 
-			else if(stmt instanceof IASTCaseStatement){
-				return getBlock(stmt);
-			} 
-			else if(stmt instanceof IASTCompoundStatement){
-				IASTCompoundStatement cmpStmt = (IASTCompoundStatement)stmt;
-				IASTStatement[] stmts = cmpStmt.getStatements();
-				for(int i=0; i<stmts.length; i++){
-					if(stmts[i] != null) return firstBlock(stmts[i]);
-				}
-				/* The compound statement is empty. Return the first block
-				 * of the next Statement.
-				 */
-				return nextBlock(stmt);
-			} 
-			else if(stmt instanceof IASTContinueStatement){
-				return getBlock(stmt);
-			} 
-			else if(stmt instanceof IASTDeclarationStatement){
-				return getBlock(stmt);
-			} 
-			else if(stmt instanceof IASTDefaultStatement){
-				return getBlock(stmt);
-			} 
-			else if(stmt instanceof IASTDoStatement){
-				IASTDoStatement doStmt = (IASTDoStatement)stmt;
-				if(doStmt.getBody() != null)
-					return firstBlock(doStmt.getBody());
-				else
-					return getBlock(doStmt.getCondition(), stmt);
-			} 
-			else if(stmt instanceof IASTExpressionStatement){
-				return getBlock(stmt);
-			} 
-			else if(stmt instanceof IASTForStatement){
-				IASTForStatement forStmt = (IASTForStatement)stmt;
-				IASTStatement initS = forStmt.getInitializerStatement();
-				if(initS != null)
-					return getBlock(initS);
-				else
-					return getBlock(forStmt.getConditionExpression(), stmt);
-			} 
-			else if(stmt instanceof IASTGotoStatement){
-				return getBlock(stmt);
-			} 
-			else if(stmt instanceof IASTIfStatement){
-				IASTIfStatement ifStmt = (IASTIfStatement)stmt;
-				return getBlock(ifStmt.getConditionExpression(), stmt);
-			} 
-			else if(stmt instanceof IASTLabelStatement){
-				IASTLabelStatement label = (IASTLabelStatement)stmt;
-				return getBlock(label.getName(), stmt, Block.label_type);
-			} 
-			else if(stmt instanceof IASTNullStatement){
-				return getBlock(stmt);
-			}
-			else if(stmt instanceof IASTProblemStatement){
-				return getBlock(stmt);
-			}
-			else if(stmt instanceof IASTReturnStatement){
-				IASTReturnStatement rtStmt = (IASTReturnStatement)stmt;
-				return getBlock(rtStmt.getReturnValue(), stmt);
-			} 
-			else if(stmt instanceof IASTSwitchStatement){
-				IASTSwitchStatement swStmt = (IASTSwitchStatement)stmt;
-				return getBlock(swStmt.getControllerExpression(), stmt);
-			} 
-			else if(stmt instanceof IASTWhileStatement){
-				IASTWhileStatement whStmt = (IASTWhileStatement)stmt;
-				return getBlock(whStmt.getCondition(), stmt);
-			}
-			return null;
-		}
-
-		
-		/*
-		 * @return
-		 */
-		public IBlock nextBlock(IASTStatement stmt){
-			
-			IASTNode node = stmt.getParent();
-			if(!(node instanceof IASTStatement)){
-				/* empty return statement for void-typed functions */
-				return exit_;
-			}
-			
-			IASTStatement parent = (IASTStatement)node;
-			if(parent instanceof IASTCompoundStatement){
-				IASTCompoundStatement cmpStmt = (IASTCompoundStatement)parent;
-				IASTStatement[] stmts = cmpStmt.getStatements();
-				int i;
-				for(i=0; i<stmts.length; i++){
-					if(stmts[i] == stmt) break;
-				}
-				for(i=i+1; i<stmts.length; i++){
-					if(stmts[i] != null) return firstBlock(stmts[i]);
-				}
-				/*stmt is the last one in compound statement */
-				return nextBlock(parent);
-			} 
-			else if(parent instanceof IASTDeclarationStatement){
-				return nextBlock(parent);
-			} 
-			else if(parent instanceof IASTDoStatement){
-				/* "stmt" is the body of Do statement, control flows to 
-				 * the continue join block
-				 */
-				return getBlock(null, parent, Block.continue_join_type);
-			} 
-			else if(parent instanceof IASTForStatement){
-				/* control flows to the for loop continue join block */
-				return getBlock(null, parent, Block.continue_join_type);
-			} 
-			else if(parent instanceof IASTIfStatement){
-				return getBlock(null, parent, Block.exit_join_type);
-			} 
-			else if(parent instanceof IASTLabelStatement){
-				return nextBlock(parent);
-			}
-			else if(parent instanceof IASTSwitchStatement){
-				return getBlock(null, parent, Block.exit_join_type);
-			} 
-			else if(parent instanceof IASTWhileStatement){
-				return getBlock(null, parent, Block.continue_join_type);
-			}
-			else
-				return nextBlock(parent);
-		}
-		
-		private void ControlFlowEdge(IBlock from, IBlock to){
-			if(!from.getSuccs().contains(to))
-				from.getSuccs().add(to);
-			if(!to.getPreds().contains(from))
-				to.getPreds().add(from);
-		}
-		
-		public int visit(IASTExpression expr){
-			if (expr instanceof IASTFunctionCallExpression) {
-				IASTFunctionCallExpression funcExpr = (IASTFunctionCallExpression)expr;
-				IASTExpression funcname = funcExpr.getFunctionNameExpression();
-				String signature = funcname.getRawSignature();
-				if(signature.equals("exit")){ //$NON-NLS-1$
-					exitBlock = true;
-				}
-				return PROCESS_SKIP;
-			}
-			return PROCESS_CONTINUE;
-		}
-	}
-
-	
-	protected void addBasicBlock(IBlock block){
-		if(!BBs_.contains(block))
-			BBs_.add(block);
-	}
-	
-	public IBlock getBlock(IASTExpression expr, IASTStatement parent) {
-		for(Iterator<IBlock> i = BBs_.iterator(); i.hasNext();){
-			IBlock bb = i.next();
-			if(bb.search(expr, parent)) return bb;
-		}
-		return null;
-	}
-
-	public IBlock getBlock(IASTStatement stmt){
-		for(Iterator<IBlock> i = BBs_.iterator(); i.hasNext();){
-			IBlock bb = i.next();
-			if(bb.search(stmt)) return bb;
-		}
-		return null;
-	}
-	
-	public IBlock getBlock(IASTName label){
-		for(Iterator<IBlock> i = BBs_.iterator(); i.hasNext();){
-			IBlock bb = i.next();
-			if(bb.search(label)) return bb;
-		}
-		return null;
-	}
-	
-	public IBlock getBlock(IASTNode content, IASTStatement parent, int type){
-		for(Iterator<IBlock> i = BBs_.iterator(); i.hasNext();){
-			Block bb = (Block)i.next();
-			if(bb.search(content, parent, type)) return bb;
-		}
-		return null;
-	}
-	
-	public IBlock getEntry() {
-		return entry_;
-	}
-
-	public IBlock getExit() {
-		return exit_;
-	}
-	
-	public void addBlock(IBlock bb){
-		if(!BBs_.contains(bb))
-			BBs_.add(bb);
-	}
-
-	@SuppressWarnings("unchecked")
-	public void buildDOM(){
-		List<IBlock> all = new ArrayList<IBlock>();
-		all.add(entry_);
-		all.addAll(BBs_);
-		all.add(exit_);
-		
-		entry_.getDOM().add(entry_);
-		
-		Iterator<IBlock> i;
-		for(i = BBs_.iterator(); i.hasNext();){
-			i.next().setDOM(all);
-		}
-		exit_.setDOM(all);
-		
-		boolean change = true;
-		while(change){
-			change = false;
-			for(i = all.iterator(); i.hasNext();){
-				IBlock block = i.next();
-				if(block == entry_) continue;
-				List<IBlock> temp = new ArrayList<IBlock>(all);
-				for(Iterator<IBlock> ii = block.getPreds().iterator(); ii.hasNext();){
-					IBlock pred = ii.next();
-					temp = intersect(temp, pred.getDOM());
-				}
-				List<IBlock> D = new ArrayList<IBlock>(temp);
-				if(!D.contains(block)) D.add(block);
-				if(!equals(D, block.getDOM())){
-					change = true;
-					block.setDOM(D);
-				}
-			}
-		}
-	}
-	
-	public void buildPDOM(){
-		/* TODO */
-	}
-	
-	@SuppressWarnings("unchecked")
-	public List intersect(List A, List B){
-		if(A == null || B == null) return null;
-		List list = new ArrayList();
-		for(Iterator i = A.iterator(); i.hasNext();){
-			Object o = i.next();
-			if(B.contains(o)) list.add(o);
-		}
-		return list;
-	}
-	@SuppressWarnings("unchecked")
-	public boolean equals(List A, List B){
-		if(A == null && B == null) return true;
-		if(A == null && B != null) return false;
-		if(A != null && B == null) return false;
-		if(A.size() != B.size()) return false;
-		for(Iterator i = A.iterator(); i.hasNext();){
-			if(!B.contains(i.next())) return false;
-		}
-		return true;
-	}
-	
-	/**
-	 * Sort Blocks in topological order
-	 */
-	private Stack<IBlock> order;
-	protected void sort(){
-		List<IBlock> all = new ArrayList<IBlock>();
-		all.add(entry_);
-		all.addAll(BBs_);
-		all.add(exit_);
-		for(Iterator<IBlock> i = all.iterator(); i.hasNext();){
-			IBlock block = i.next();
-			block.setAttr("color", new Integer(0)); //$NON-NLS-1$
-		}
-		order = new Stack<IBlock>();
-		for(Iterator<IBlock> i = all.iterator(); i.hasNext();){
-			IBlock block = (IBlock)i.next();
-			int color = ((Integer)block.getAttr("color")).intValue(); //$NON-NLS-1$
-			if(color == 0)
-				DFSVisit(block);
-		}
-
-		IBlock b1 = order.pop();
-		IBlock b2 = null;
-		while(!order.empty()){
-			b2 = order.pop();
-			b1.setTopNext(b2);
-			b1 = b2;
-		}
-	}
-	
-	protected void DFSVisit(IBlock block){
-		block.setAttr("color", new Integer(1)); //gray //$NON-NLS-1$
-		for(Iterator<IBlock> i = block.getSuccs().iterator(); i.hasNext();){
-			IBlock succ = i.next();
-			if(isBackEdgeSucc(block, succ)) continue;
-			int color = ((Integer)succ.getAttr("color")).intValue(); //$NON-NLS-1$
-			if(color == 0) //white
-				DFSVisit(succ);
-		}
-		order.push(block);
-	}
-	
-	/**
-	 * @return "true" if edge (from, to) is a back edge. 
-	 */
-	protected boolean isBackEdgeSucc(IBlock from, IBlock to){
-		return from.getSuccs().contains(to) && from.getDOM().contains(to);
-	}
-	
-	protected void otherOPs(){
-		/* Empty method for future extensions */
-	}
-	
-	public void print(){
-		for(IBlock b = entry_; b != null; b = b.topNext())
-			b.print();
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/impl/ResourceCollector.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/impl/ResourceCollector.java
deleted file mode 100644
index 4c839cf..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt/src/org/eclipse/ptp/pldt/mpi/analysis/cdt/graphs/impl/ResourceCollector.java
+++ /dev/null

@@ -1,193 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.impl;
-
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.CDOM;
-import org.eclipse.cdt.core.dom.IASTServiceProvider;
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTCompositeTypeSpecifier;
-import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier;
-import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
-import org.eclipse.cdt.core.dom.ast.IASTElaboratedTypeSpecifier;
-import org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDeclarator;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.model.ICElement;
-import org.eclipse.cdt.core.model.ITranslationUnit;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraph;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraphNode;
-
-/**
- * The resource collector collects all functions for the call graph, but does not
- * calculate the caller and callee relations.
- * 
- * @author Yuan Zhang, Beth Tibbitts
- *
- */
-public class ResourceCollector extends ASTVisitor {
-	protected ICallGraph CG_; 
-	protected IFile file_;
-	protected int depth;
-	private static final boolean traceOn=false;
-	
-	/**
-	 * Resource collector finds all functions in a given source file,
-	 * and adds them to the given call graph
-	 * @param cg call graph that will have this information added to it
-	 * @param file source file whose functions will be discovered and catalogued
-	 */
-	public ResourceCollector(ICallGraph cg, IFile file){
-		CG_ = cg;
-		file_ = file;
-	}
-	
-	/**
-	 * Use an ASTVisitor to discover the functions in the the given source and add them to the call graph
-	 */
-	public void run(){
-		this.shouldVisitDeclarations = true;
-		this.shouldVisitTranslationUnit = true;
-		if(traceOn)System.out.println("ResourceCollector.run()  file: "+file_+"  exists? "+file_.exists()); //$NON-NLS-1$ //$NON-NLS-2$
-		IASTTranslationUnit ast_ = null;
-		try {
-            ast_ = CDOM.getInstance().getASTService().getTranslationUnit(file_,
-                    CDOM.getInstance().getCodeReaderFactory(CDOM.PARSE_SAVED_RESOURCES));
-        } catch (IASTServiceProvider.UnsupportedDialectException e) {
-        } catch (NullPointerException npe) {
-        	System.out.println("ResourceCollector: no ast available from CDOM.. remote project? will try alt. approach.");
-        }
-        if(traceOn)System.out.println("     initial ast construction: ast_="+ast_); //$NON-NLS-1$
-        boolean temp=true;
-        
-        if(temp && ast_==null) {
-        	// newer way to get ast
-        	if(file_ instanceof IAdaptable) {
-        		ICElement ce = (ICElement) file_.getAdapter(ICElement.class);
-        		if(traceOn)System.out.println("     ICElement: ="+ce); //$NON-NLS-1$
-        		if(ce instanceof ITranslationUnit) {
-        			ITranslationUnit cetu=(ITranslationUnit)ce;
-        			IASTTranslationUnit ast;
-					try {
-						ast = cetu.getAST();
-						if(traceOn)System.out.println("ast: "+ast); //$NON-NLS-1$
-					} catch (CoreException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-        			
-        		}
-        		ITranslationUnit tu=(ITranslationUnit)file_.getAdapter(ITranslationUnit.class);
-        		try {
-					ast_=tu.getAST();
-				} catch (CoreException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-        	}
-        }
-        if(traceOn)System.out.println("     ast_="+ast_); //$NON-NLS-1$
-        depth = 0;
-        ast_.accept(this);
-	}
-	
-	/**
-	 * visits declaration nodes to catalog the function declarations
-	 */
-	public int visit(IASTDeclaration declaration) {
-		String filename = declaration.getContainingFilename();
-		// if(!filename.endsWith(".c") || !filename.endsWith(".C"))
-		if (filename.endsWith(".h")) //$NON-NLS-1$
-			return PROCESS_SKIP;
-
-		if (declaration instanceof IASTFunctionDefinition) {
-			depth++;
-			IASTFunctionDefinition fd = (IASTFunctionDefinition) declaration;
-			ICallGraphNode node = addCallGraphNode(file_, filename, fd);
-			CG_.addNode(node);
-			return PROCESS_SKIP;
-		} else if (declaration instanceof IASTSimpleDeclaration) {
-			if (depth > 0)
-				return PROCESS_SKIP; // not global
-			IASTSimpleDeclaration sdecl = (IASTSimpleDeclaration) declaration;
-			/* if the declarator is null, then it is a structure specifier */
-			if (sdecl.getDeclarators() == null)
-				return PROCESS_CONTINUE;
-			IASTDeclSpecifier spec = sdecl.getDeclSpecifier();
-			if (spec instanceof IASTCompositeTypeSpecifier
-					|| spec instanceof IASTElaboratedTypeSpecifier
-					|| spec instanceof IASTEnumerationSpecifier)
-				return PROCESS_SKIP;
-
-			List<String> env = CG_.getEnv();
-			IASTDeclarator[] declarators = sdecl.getDeclarators();
-			for (int j = 0; j < declarators.length; j++) {
-				if (declarators[j] instanceof IASTFunctionDeclarator)
-					continue;
-				IASTName n = declarators[j].getName();
-				String var = n.toString();
-				if (doQuickOptionalTest(var))
-					continue;
-				if (!env.contains(var))
-					env.add(var);
-				doOtherDeClaratorStuff(declarators[j]);
-			}
-		}
-		return PROCESS_CONTINUE;
-	}
-	
-
-	public int leave(IASTDeclaration declaration) 
-	{
-		String filename = declaration.getContainingFilename();
-		//if(!filename.endsWith(".c") || !filename.endsWith(".C"))
-		if(filename.endsWith(".h")) //$NON-NLS-1$
-			return PROCESS_SKIP;
-		
-		if (declaration instanceof IASTFunctionDefinition) {
-			depth --;
-			return PROCESS_SKIP;
-		}
-		return PROCESS_CONTINUE;
-	}
-	/**
-	 * Can be overridden by subclasses to create a specific kind of call graph
-	 * node if required
-	 * 
-	 * @return call graph node created
-	 */
-	protected ICallGraphNode addCallGraphNode(IFile file, String filename,
-			IASTFunctionDefinition fd) {
-		ICallGraphNode cgnode = new CallGraphNode(file, filename, fd);
-		return cgnode;
-	}
-	/** 
-     * extra optional test that derived class can do
-     */
-	protected boolean doQuickOptionalTest(String var){
-	 return true;
-	 }
-	 
-	/**
-	 * optional stuff that derived class may want to do at this point
-	 * @param declarator
-	 */
-	 protected void doOtherDeClaratorStuff(IASTDeclarator declarator){}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/.classpath b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/.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.analysis/.project b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/.project
deleted file mode 100644
index 3ec8e43..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.mpi.analysis</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.analysis/.settings/org.eclipse.jdt.core.prefs b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 38eb16d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,8 +0,0 @@
-#Fri Apr 16 12:50:15 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.analysis/META-INF/MANIFEST.MF b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/META-INF/MANIFEST.MF
deleted file mode 100644
index 75e8a21..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/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.pldt.mpi.analysis; singleton:=true
-Bundle-Version: 4.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.pldt.mpi.analysis.Activator
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.ptp.pldt.mpi.analysis,
- org.eclipse.ptp.pldt.mpi.analysis.actions,
- org.eclipse.ptp.pldt.mpi.analysis.analysis,
- org.eclipse.ptp.pldt.mpi.analysis.view
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.cdt.core,
- org.eclipse.ptp.pldt.common,
- org.eclipse.jface.text,
- org.eclipse.cdt.ui,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.editors,
- com.ibm.icu,
- org.eclipse.ui.ide,
- org.eclipse.ptp.pldt.mpi.analysis.cdt
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/about.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/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.analysis/build.properties b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/build.properties
deleted file mode 100644
index 23d6cb6..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/build.properties
+++ /dev/null

@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               icons/,\
-               plugin.properties,\
-               about.html

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/icons/barrier.gif b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/icons/barrier.gif
deleted file mode 100644
index 75a9760..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/icons/barrier.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/icons/collapseall.gif b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/icons/collapseall.gif
deleted file mode 100644
index dc923f5..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/icons/collapseall.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/icons/expandall.gif b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/icons/expandall.gif
deleted file mode 100644
index c4a67bb..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/icons/expandall.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/plugin.properties b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/plugin.properties
deleted file mode 100644
index cd02ae0..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/plugin.properties
+++ /dev/null

@@ -1,24 +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 Parallel Language Development Tools MPI Barrier Analysis
-pluginProvider=Eclipse.org
-
-matchesView.name=MPI Barrier Matches
-errorsView.name=MPI Barrier Errors
-barriersView.name=MPI Barriers
-barrier.artifact.marker = MPI Barrier Artifact Marker
-barrier.annotation.marker = MPI Barrier Annotation Marker
-barrier.matchingset.marker = MPI Barrier Matching Set Marker
-barrier.matchingset.annotation.marker = MPI Barrier Matching Set Annotation Marker
-mpi.barrier.error.marker = MPI Barrier Error Marker
-mpi.barrier.error.annotation.marker = MPI Barrier Error Annotation Marker
-barrier.analysis.command.name = MPI Barrier Analysis
-barrier.analysis.command.label = MPI Barrier Analysis
-run.barrier.analysis.command.tooltip = Run MPI Barrier Analysis on selected project, folder, or file
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/plugin.xml b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/plugin.xml
deleted file mode 100644
index 26530f5..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/plugin.xml
+++ /dev/null

@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.ui.views">
-      <view
-            category="org.eclipse.ptp.ui.views"
-            class="org.eclipse.ptp.pldt.mpi.analysis.view.MPIErrorView"
-            icon="icons/barrier.gif"
-            id="org.eclipse.ptp.pldt.mpi.analysis.view.MPIErrorView"
-            name="%errorsView.name">
-      </view>
-      <view
-            name="%barriersView.name"
-            icon="icons/barrier.gif"
-            category="org.eclipse.ptp.ui.views"
-            class="org.eclipse.ptp.pldt.mpi.analysis.view.MPIBarrierView"
-            id="org.eclipse.ptp.pldt.mpi.analysis.view.MPIBarrierTableView">
-      </view>
-      <view
-            category="org.eclipse.ptp.ui.views"
-            class="org.eclipse.ptp.pldt.mpi.analysis.view.MPIBarrierMatchingSetView"
-            icon="icons/barrier.gif"
-            id="org.eclipse.ptp.pldt.mpi.analysis.view.MPIBarrierMatchingSetTableView"
-            name="%matchesView.name">
-      </view>
-   </extension>
-
-
-
-   <!--  MPI Barrier markers -->
-   <extension point="org.eclipse.core.resources.markers"
-		id="mpiBarrierMarker"
-        name="%barrier.artifact.marker">
-      <super type="org.eclipse.core.resources.textmarker"/>
-      <attribute name="fileName"/>
-      <attribute name="theLineNo"/>
-      <attribute name="theNewLineNo"/>
-      <attribute name="columnNo"/>
-      <attribute name="name"/>
-      <attribute name="description"/>
-      <attribute name="constructType"/>
-      <attribute name="uniqueID"/>
-   </extension>
-   <!-- this changes the marker image in the editor marker bar  -->
-   <extension
-         point="org.eclipse.ui.editors.annotationTypes">
-      <type
-            markerType="org.eclipse.ptp.pldt.mpi.analysis.mpiBarrierMarker"
-            name="org.eclipse.ptp.pldt.mpi.analysis.mpiBarrierMarkerAnnotation">
-      </type>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors.markerAnnotationSpecification">
-      <specification
-            annotationType="org.eclipse.ptp.pldt.mpi.analysis.mpiBarrierMarkerAnnotation"
-            icon="icons/barrier.gif" 
-            
-            presentationLayer="3"
-            label="%barrier.annotation.marker"
-            
-            textPreferenceKey="mpiIndication"
-            textPreferenceValue="true"
-            highlightPreferenceKey="artifactHighlighting"
-            highlightPreferenceValue="false"
-            colorPreferenceKey="artifactIndicationColor"
-            colorPreferenceValue="0,128,192"
-            verticalRulerPreferenceKey="artifactIndicationInVerticalRuler"
-            verticalRulerPreferenceValue="true"
-			showInNextPrevDropdownToolbarActionKey="showPortingInNextPrevDropdownToolbarAction"
-            showInNextPrevDropdownToolbarAction="false"
-            overviewRulerPreferenceKey="artifactIndicationInOverviewRuler"
-            overviewRulerPreferenceValue="true"
-            
-            includeOnPreferencePage="true"
-            isGoToPreviousNavigationTargetKey="isPortingGoToPreviousNavigationTarget"
-
-            isGoToNextNavigationTargetKey="isPortingRecordGoToNextNavigationTarget"
-            >
-      </specification>  
-   </extension>
-
-	
-   <!-- Matching Set Artifacts -->
-   <extension point="org.eclipse.core.resources.markers"
-		id="mpiBarrierMatchingSetMarker"
-        name="%barrier.matchingset.marker">
-      <super type="org.eclipse.core.resources.textmarker"/>
-      <attribute name="fileName"/>
-      <attribute name="theLineNo"/>
-      <attribute name="theNewLineNo"/>
-      <attribute name="columnNo"/>
-      <attribute name="name"/>
-      <attribute name="description"/>
-      <attribute name="constructType"/>
-      <attribute name="uniqueID"/>
-   </extension>
-   <!-- this changes the marker image in the editor marker bar  -->
-   <extension
-         point="org.eclipse.ui.editors.annotationTypes">
-      <type
-            markerType="org.eclipse.ptp.pldt.mpi.analysis.mpiBarrierMatchingSetMarker"
-            name="org.eclipse.ptp.pldt.mpi.analysis.mpiBarrierMatchingSetMarkerAnnotation">
-      </type>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors.markerAnnotationSpecification">
-      <specification
-            annotationType="org.eclipse.ptp.pldt.mpi.analysis.mpiBarrierMatchingSetMarkerAnnotation"
-            icon="icons/barrier.gif" 
-            
-            presentationLayer="3"
-            label="%barrier.matchingset.annotation.marker"
-            
-            textPreferenceKey="mpiIndicationMatch"
-            textPreferenceValue="true"
-            highlightPreferenceKey="artifactHighlightingMatch"
-            highlightPreferenceValue="false"
-            colorPreferenceKey="artifactIndicationColorMatch"
-            colorPreferenceValue="0,128,192"
-            verticalRulerPreferenceKey="artifactIndicationInVerticalRulerMatch"
-            verticalRulerPreferenceValue="true"
-			showInNextPrevDropdownToolbarActionKey="showPortingInNextPrevDropdownToolbarAction"
-            showInNextPrevDropdownToolbarAction="false"
-            overviewRulerPreferenceKey="artifactIndicationInOverviewRulerMatch"
-            overviewRulerPreferenceValue="true"
-            
-            includeOnPreferencePage="true"
-            isGoToPreviousNavigationTargetKey="isPortingGoToPreviousNavigationTarget"
-
-            isGoToNextNavigationTargetKey="isPortingRecordGoToNextNavigationTarget"
-            >
-      </specification>  
-   </extension>
-
-   <!-- Barrier Error Artifacts -->
-   <extension point="org.eclipse.core.resources.markers"
-		id="mpiErrorMarker"
-        name="%mpi.barrier.error.marker">
-      <super type="org.eclipse.core.resources.problemmarker"/>
-      <attribute name="fileName"/>
-      <attribute name="theLineNo"/>
-      <attribute name="theNewLineNo"/>
-      <attribute name="columnNo"/>
-      <attribute name="name"/>
-      <attribute name="description"/>
-      <attribute name="constructType"/>
-      <attribute name="uniqueID"/>
-   </extension>
-   <!-- this changes the marker image in the editor marker bar  -->
-   <extension
-         point="org.eclipse.ui.editors.annotationTypes">
-      <type
-            markerSeverity="2"
-            markerType="org.eclipse.ptp.pldt.mpi.analysis.mpiErrorMarker"
-            name="org.eclipse.ptp.pldt.mpi.analysis.mpiErrorMarkerAnnotation">
-      </type>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors.markerAnnotationSpecification">
-      <specification
-            annotationType="org.eclipse.ptp.pldt.mpi.analysis.mpiErrorMarkerAnnotation"
-            icon="icons/barrier.gif" 
-            
-            presentationLayer="3"
-            label="%mpi.barrier.error.annotation.marker"
-            
-            textPreferenceKey="mpiIndicationError"
-            textPreferenceValue="true"
-            highlightPreferenceKey="artifactHighlightingError"
-            highlightPreferenceValue="false"
-            colorPreferenceKey="artifactIndicationColorError"
-            colorPreferenceValue="128,0,0"
-            verticalRulerPreferenceKey="artifactIndicationInVerticalRulerError"
-            verticalRulerPreferenceValue="true"
-			showInNextPrevDropdownToolbarActionKey="showPortingInNextPrevDropdownToolbarAction"
-            showInNextPrevDropdownToolbarAction="false"
-            overviewRulerPreferenceKey="artifactIndicationInOverviewRulerError"
-            overviewRulerPreferenceValue="true"
-            
-            includeOnPreferencePage="true"
-            isGoToPreviousNavigationTargetKey="isPortingGoToPreviousNavigationTarget"
-
-            isGoToNextNavigationTargetKey="isPortingRecordGoToNextNavigationTarget"
-            >
-      </specification>  
-   </extension>
-   
-      <extension
-            point="org.eclipse.ui.commands">
-         <command
-               defaultHandler="org.eclipse.ptp.pldt.mpi.analysis.actions.RunAnalyseMPIAnalysiscommandHandler"
-               id="org.eclipse.ptp.pldt.mpi.analysis.command2"
-               name="%barrier.analysis.command.name">
-         </command>
-      </extension>
-      <extension point="org.eclipse.ui.menus">
-         <menuContribution
-               locationURI="menu:org.eclipse.ptp.pldt.common.toolbar.command1?after=separator4.barrier">
-            <command
-                  commandId="org.eclipse.ptp.pldt.mpi.analysis.command2"
-                  icon="icons/barrier.gif"
-                  label="%barrier.analysis.command.label"
-                  style="push"
-                  tooltip="%run.barrier.analysis.command.tooltip">
-            </command>
-         </menuContribution>
-
-      </extension>
-
-</plugin>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/Activator.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/Activator.java
deleted file mode 100644
index a8339df..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/Activator.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.pldt.mpi.analysis.messages.Messages;
-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.pldt.mpi.analysis"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (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/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/IDs.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/IDs.java
deleted file mode 100644
index 6798e26..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/IDs.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,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.pldt.mpi.analysis;
-
-/**
- * ID values shared by several classes in this plug-in
- * 
- * @author Beth Tibbitts
- *
- */
-public class IDs {
-	public static final String barrierMarkerID = "org.eclipse.ptp.pldt.mpi.analysis.mpiBarrierMarker"; //$NON-NLS-1$
-
-	/**
-	 * The marker id for barrier matching sets
-	 */
-	public static final String matchingSetMarkerID = "org.eclipse.ptp.pldt.mpi.analysis.mpiBarrierMatchingSetMarker"; //$NON-NLS-1$
-	
-    public static final String matchingSetViewID="org.eclipse.ptp.pldt.mpi.analysis.view.MPIBarrierMatchingSetTableView"; //$NON-NLS-1$
-    public static final String errorViewID =     "org.eclipse.ptp.pldt.mpi.analysis.view.MPIErrorView"; //$NON-NLS-1$
-    public static final String barrierViewID="org.eclipse.ptp.pldt.mpi.analysis.view.MPIBarrierTableView"; //$NON-NLS-1$
-    
-    /* For error counter examples */
-    public static final String errorMarkerID = "org.eclipse.ptp.pldt.mpi.analysis.errorMarker"; //$NON-NLS-1$
-	/**
-	 * The marker attribute name for a parent node.
-	 * All markers with the same parent value may be considered children of the same parent.
-	 *  
-	 */
-    public static final String parentIDAttr = "parentID"; //$NON-NLS-1$
-    public static final String myIDAttr = "myID"; //$NON-NLS-1$
-    public static final String myNameAttr = "myName"; //$NON-NLS-1$
-    public static final String myIndexAttr = "myIndex";    //$NON-NLS-1$
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/actions/MPIAnalysisManager.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/actions/MPIAnalysisManager.java
deleted file mode 100644
index 7efacd2..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/actions/MPIAnalysisManager.java
+++ /dev/null

@@ -1,113 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,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.analysis.actions;
-
-import org.eclipse.ptp.pldt.mpi.analysis.IDs;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.BarrierTable;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.MPIBarrierAnalysisResults;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.MPIBarrierExpr;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.MPIBarrierMatching;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.MPICFGBuilder;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.MPICallGraph;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.MPIDUChain;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.MPIMVAnalysis;
-import org.eclipse.ptp.pldt.mpi.analysis.view.BarrierArtifacts;
-import org.eclipse.ptp.pldt.mpi.analysis.view.MPIArtifactMarkingVisitor;
-import org.eclipse.ptp.pldt.mpi.analysis.view.MatchingSet;
-import org.eclipse.ptp.pldt.mpi.analysis.view.ShowErrors;
-
-/**
- * Main class for handling MPI Barrier Analysis
- */
-public class MPIAnalysisManager {
-	protected BarrierTable btable_;
-	protected MPICallGraph cg_;
-	private static final boolean traceOn = false;
-
-	public MPIAnalysisManager(MPICallGraph cg) {
-		cg_ = cg;
-	}
-
-	/**
-	 * Runs analysis and returns true if any errors were found
-	 * 
-	 * @return
-	 * @since 4.0
-	 */
-	public boolean run(boolean reportErrors) {
-		if (traceOn)
-			System.out.println("MPI AM: 1. build CG"); //$NON-NLS-1$
-		cg_.buildCG();
-		// cg_.print();
-		/*
-		 * if(cg_.hasError()){ String markerID = IDs.barrierMarkerID;
-		 * MPIArtifactMarkingVisitor visitor = new
-		 * MPIArtifactMarkingVisitor(markerID); BarrierArtifacts ba = new
-		 * BarrierArtifacts(cg_, visitor); ba.run(); return; }
-		 */
-
-		btable_ = cg_.getBarrierTable();
-		if (traceOn)
-			System.out.println("2. Call Graph finished !"); //$NON-NLS-1$
-
-		MPIBarrierExpr BE = new MPIBarrierExpr(btable_, cg_);
-		BE.run();
-		if (traceOn)
-			System.out.println("3. Barrier Expression Construction finished !"); //$NON-NLS-1$
-
-		MPICFGBuilder cfg = new MPICFGBuilder(cg_);
-		cfg.run();
-		if (traceOn)
-			System.out.println("4. Control Flow Graph Construction finished !"); //$NON-NLS-1$
-
-		MPIDUChain rd = new MPIDUChain(cg_);
-		rd.run();
-		if (traceOn)
-			System.out.println("5. Reaching Definition and Phi Placement finished !"); //$NON-NLS-1$
-
-		MPIMVAnalysis mva = new MPIMVAnalysis(cg_);
-		mva.run();
-		if (traceOn)
-			System.out.println("6. Multi-valued Analysis finished !"); //$NON-NLS-1$
-
-		MPIBarrierMatching bm = new MPIBarrierMatching(cg_, btable_);
-		bm.run(reportErrors);
-		if (traceOn)
-			System.out.println("7. Barrier Matching finished! "); //$NON-NLS-1$
-
-		MPIBarrierAnalysisResults results = new MPIBarrierAnalysisResults();
-		results.setBarrierTable(btable_);
-		if (traceOn)
-			System.out.println("8. ...got barrier table "); //$NON-NLS-1$
-
-		String markerID = IDs.barrierMarkerID;
-		MPIArtifactMarkingVisitor visitor = new MPIArtifactMarkingVisitor(markerID);
-		BarrierArtifacts ba = new BarrierArtifacts(cg_, visitor);
-		ba.run();
-		if (traceOn)
-			System.out.println("9. ... got barrier artifacts "); //$NON-NLS-1$
-
-		MatchingSet msv = new MatchingSet(btable_);
-		msv.run();
-		if (traceOn)
-			System.out.println("10. ...got matching set "); //$NON-NLS-1$
-
-		ShowErrors se = new ShowErrors(bm.getErrors());
-		boolean foundError = se.run();
-		if (traceOn)
-			System.out.println("11.  ... got errors (if any) "); //$NON-NLS-1$
-
-		return foundError;
-
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/actions/RunAnalyseMPIAnalysiscommandHandler.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/actions/RunAnalyseMPIAnalysiscommandHandler.java
deleted file mode 100644
index d5197a9..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/actions/RunAnalyseMPIAnalysiscommandHandler.java
+++ /dev/null

@@ -1,215 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,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.analysis.actions;
-
-import java.util.Iterator;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ptp.pldt.common.actions.AnalysisDropdownHandler;
-import org.eclipse.ptp.pldt.common.actions.RunAnalyseHandler;
-import org.eclipse.ptp.pldt.common.util.ViewActivator;
-import org.eclipse.ptp.pldt.mpi.analysis.IDs;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.MPICallGraph;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.MPIResourceCollector;
-import org.eclipse.ptp.pldt.mpi.analysis.messages.Messages;
-
-
-/**
- * Do MPI barrier analysis from dropdown toolbar menu
- * 
- * @author Beth Tibbitts
- *
- */
-public class RunAnalyseMPIAnalysiscommandHandler extends RunAnalyseHandler  {
-	protected MPICallGraph callGraph_;
-	boolean traceOn=false;
-	
-	public RunAnalyseMPIAnalysiscommandHandler(){ 
-		callGraph_ = null;
-	}
-
-	/** 
-	 * Execute the action for MPI barrier analysis
-	 */
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		boolean foundError=false;
-		getSelection(event);
-		AnalysisDropdownHandler.setLastHandledAnalysis(this,selection);
-		if ((selection == null) || selection.isEmpty()) {
-			MessageDialog.openWarning(null, Messages.RunAnalyseMPIAnalysiscommandHandler_noFilesSelectedForAnalysis,
-							Messages.RunAnalyseMPIAnalysiscommandHandler_pleaseSelect);
-			return null;
-		} else {
-			if(isRemote(selection)) {
-				MessageDialog.openInformation(null, Messages.RunAnalyseMPIAnalysiscommandHandler_remoteProjectFound, Messages.RunAnalyseMPIAnalysiscommandHandler_remoteNotSupported);
-				return null;
-			}
-			final boolean reportErrors=true;
-			foundError = analyseBarriers(selection,reportErrors);
-		}
-		ViewActivator.activateView(IDs.matchingSetViewID);
-		ViewActivator.activateView(IDs.barrierViewID);
-		// if error found, assure its view has focus
-		if(foundError) {
-			ViewActivator.activateView(IDs.errorViewID);
-		}
-		return null;
-	}
-
-	/**
-	 * Basics of MPI barrier analysis encapsulated here so can be used by
-	 * testing <br>
-	 * Results are saved in the markers that are generated.
-	 * 
-	 * @return true if error found
-	 * @since 4.0
-	 */
-	public boolean analyseBarriers(IStructuredSelection selection, boolean reportErrors) {
-		boolean foundError;
-		callGraph_ = new MPICallGraph();
-		//int numFiles=this.countFilesSelected();
-		// BRT use numfiles for a progress monitor?
-
-		for(@SuppressWarnings("rawtypes")
-		Iterator iter = selection.iterator(); iter.hasNext();){
-			Object obj =  iter.next();
-			// It can be a Project, Folder, File, etc...
-			if (obj instanceof IAdaptable) {
-				final IResource res = (IResource) ((IAdaptable) obj).getAdapter(IResource.class);
-				if (traceOn)
-					System.out.println("resourceCollector on " + res.getName()); //$NON-NLS-1$
-				// FIXME put this in a runnable to batch resource changes?
-				if (res != null) {
-					resourceCollector(res);
-				}
-			}
-		} // end for
-		MPIAnalysisManager manager = new MPIAnalysisManager(callGraph_);
-		foundError=manager.run(reportErrors);
-		return foundError;
-	}
-	
-	/**
-	 * Run analysis (collect resource info in the call graph) on a resource
-	 * (e.g. File or Folder) <br>
-	 * Will descend to members of folder
-	 * 
-	 * @param resource
-	 *            the resource upon which barrier analysis was initiated: file,
-	 *            folder, or project
-	 * @return
-	 */
-	protected boolean resourceCollector(IResource resource) {
-
-		boolean foundError = false;
-
-		if (resource instanceof IFile) {
-			try{
-				resource.deleteMarkers(IMarker.PROBLEM, true, IResource.DEPTH_INFINITE);
-			} catch(CoreException e){
-				//System.out.println("Exception deleting markers.");
-			}
-			IFile file = (IFile) resource;
-			String filename = file.getName();
-			if(filename.endsWith(".c")){ //$NON-NLS-1$
-				if (traceOn)
-					System.out.println("resourceCollector on c file: " + file.getName()); //$NON-NLS-1$
-				MPIResourceCollector rc = new MPIResourceCollector(callGraph_, file); // BRT why  'new'  each time?
-				rc.run();
-			}
-			return true;
-		} else if (resource instanceof IContainer) {
-			IContainer container = (IContainer) resource;
-			try {
-				IResource[] mems = container.members();
-				for (int i = 0; i < mems.length; i++) {
-					if (traceOn)
-						System.out.println("descend to " + mems[i].getName()); //$NON-NLS-1$
-					boolean err = resourceCollector(mems[i]);
-					foundError = foundError || err;
-				}
-			} catch (CoreException e) {
-				e.printStackTrace();
-			}
-		} else {
-			String name = ""; //$NON-NLS-1$
-			if (resource instanceof IResource) {
-				IResource res = resource;
-				// name=res.getName(); // simple filename only, no path info
-				IPath path = res.getProjectRelativePath();
-				name = path.toString();
-			}
-			System.out.println("Cancelled by User, aborting analysis on subsequent files... " + name); //$NON-NLS-1$
-		}
-
-		return foundError;
-	}
-	
-	/**
-	 * Returns true if resource(s) represented by given selection are remote.
-	 * Note that there may be some uncertainly that it's local if the returned value is false,
-	 * but a returned value of 'true' means the resource is definitely determined to be remote.
-	 * @param selection
-	 * @return
-	 */
-	private boolean isRemote (IStructuredSelection selection) {	
-		Object s1=selection.getFirstElement();
-		if(s1 instanceof IAdaptable) {
-			IAdaptable iAdaptable = (IAdaptable) s1;
-			IResource resource=(IResource) iAdaptable.getAdapter(IResource.class);
-			IProject proj = resource.getProject();
-			if(isRemote(proj)) {
-				return true;
-			}			
-		}
-		return false; 
-
-	}
-	
-
-
-	/**
-	 * should go in a more publicly reusable/accessible place after 5.0 e.g. pldt.common.util.Utility
-	 * @param project
-	 * @return
-	 */
-	private static boolean isRemote(IProject project) {
-		final String REMOTE_NATURE_ID = "org.eclipse.ptp.rdt.core.remoteNature"; //$NON-NLS-1$
-		String[] natureIDs;
-		try {
-			natureIDs = project.getDescription().getNatureIds();
-		} catch (CoreException e) {
-			e.printStackTrace();
-			return false;
-		}
-		for (int i = 0; i < natureIDs.length; i++) {
-			String id = natureIDs[i];
-			if(id.equals(REMOTE_NATURE_ID)) {
-				return true;
-			}		
-		}
-		return false;
-		
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/BarrierCFG.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/BarrierCFG.java
deleted file mode 100644
index dd37aa8..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/BarrierCFG.java
+++ /dev/null

@@ -1,123 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis.analysis;
-
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.impl.Block;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.impl.ControlFlowGraph;
-
-public class BarrierCFG extends ControlFlowGraph {
-	
-	public BarrierCFG(IASTStatement prog){
-		super(prog);
-	}
-	
-	protected void collectBlocks(){
-		entry_ = new Block();
-		exit_ = new Block();
-		BarrierCFGBlockCollector bc = new BarrierCFGBlockCollector();
-		bc.run();
-	}
-	
-	class BarrierCFGBlockCollector extends ASTVisitor{
-
-		public void run(){
-			this.shouldVisitStatements = true;
-			this.shouldVisitDeclarations = true;
-			prog_.accept(this);
-		}
-		
-		/*
-		public int visit(IASTStatement stmt) 
-		{
-			IBlock block;
-			if(stmt instanceof IASTBreakStatement){
-				block = new BarrierCFGBlock(stmt, stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTCaseStatement){
-				block = new BarrierCFGBlock(stmt, stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTCompoundStatement){
-			} 
-			else if(stmt instanceof IASTContinueStatement){
-				block = new BarrierCFGBlock(stmt, stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTDeclarationStatement){
-				block = new BarrierCFGBlock(stmt, stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTDefaultStatement){
-				block = new BarrierCFGBlock(stmt, stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTDoStatement){
-				block = new BarrierCFGBlock(stmt, stmt);
-				addBlock(block);
-				return PROCESS_SKIP;
-			} 
-			else if(stmt instanceof IASTExpressionStatement){
-				block = new BarrierCFGBlock(stmt, stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTForStatement){
-				block = new BarrierCFGBlock(stmt, stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTGotoStatement){
-				block = new Block(stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTIfStatement){
-				IASTIfStatement ifStmt = (IASTIfStatement)stmt;
-				block = new Block(ifStmt.getConditionExpression(), stmt);
-				addBlock(block);
-				IBlock join = new Block(null, stmt);
-				addBlock(join);
-			} 
-			else if(stmt instanceof IASTLabelStatement){
-				IASTLabelStatement label = (IASTLabelStatement)stmt;
-				block = new Block(label.getName(), stmt, Block.label_type);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTNullStatement){
-				block = new Block(stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTProblemStatement){
-				block = new Block(stmt);
-				addBlock(block);
-			}
-			else if(stmt instanceof IASTReturnStatement){
-				IASTReturnStatement rtStmt = (IASTReturnStatement)stmt;
-				block = new Block(rtStmt.getReturnValue(), stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTSwitchStatement){
-				IASTSwitchStatement swStmt = (IASTSwitchStatement)stmt;
-				block = new Block(swStmt.getControllerExpression(), stmt);
-				addBlock(block);
-				IBlock join = new Block(null, stmt);
-				addBlock(join);
-			} 
-			else if(stmt instanceof IASTWhileStatement){
-				block = new Block(stmt);
-				addBlock(block);
-			} 
-			return PROCESS_CONTINUE;
-		} */
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/BarrierCFGBlock.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/BarrierCFGBlock.java
deleted file mode 100644
index 24cf1be..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/BarrierCFGBlock.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis.analysis;
-
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.impl.Block;
-
-public class BarrierCFGBlock extends Block {
-	protected BarrierExpression BE_;
-	
-	public BarrierCFGBlock(IASTNode content, IASTStatement parent, int type){
-		super(content, parent, type);
-		BE_ = null;
-	}
-	
-	public BarrierExpression getBE(){return BE_;}
-	public void setBE(BarrierExpression be) {BE_ = be;}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/BarrierExpression.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/BarrierExpression.java
deleted file mode 100644
index 96afc81..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/BarrierExpression.java
+++ /dev/null

@@ -1,256 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,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.analysis.analysis;
-
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-
-/**
- * "A Barrier Expression is a special form of a path expression that, for a
- * given program point, describes the sequences of barriers that may execute
- * until a thread reaches that point. Barrier Expressions provide a compact
- * representation of the synchronization structure of the program."
- * 
- * -- From Zhang/Duesterwald paper
- * 
- * @author beth
- * 
- */
-public class BarrierExpression {
-	protected BarrierExpressionOP op_;
-	protected BarrierExpression operand1_;
-	protected BarrierExpression operand2_;
-	
-	protected int length;
-	/** 'Top' is symbol for infinite length, or error */
-	public static final int TOP = -3;
-	
-	/* For instrumentation */
-	public static int count_branch = 0;
-	public static int count_repeat = 0;
-	public static int count_node = 0;
-	
-	boolean visited;
-	boolean ceVisited; // visited in counter example construction
-	
-	/** There are four terminals: <br>
-	 * barrier id(int > 0) <br>
-	 * function name (String) <br>
-	 * \top -- undecidable <br>
-	 * \bot -- no barrier
-	 */  
-	protected int type;
-	/** type is bottom - no barrier */
-	public static final int BE_bot = 1;
-	/** type is barrier ID (int > 0)*/
-	public static final int BE_ID = 2;
-	/** type is function name (String) */
-	public static final int BE_func = 3;
-	
-	
-	protected int barrierID;
-	protected String funcName_; 
-	
-	protected BarrierExpression parent_;
-	
-	/** Has the mismatching error already reported? */
-	protected boolean error = false;
-	
-	public BarrierExpression(){
-		init();
-	}
-	
-	public BarrierExpression(int operator, IASTExpression cond, 
-			IASTStatement stmt){
-		init();
-		op_ = new BarrierExpressionOP(operator, cond, stmt);
-		if(op_.getOperator() == BarrierExpressionOP.op_branch)
-			count_branch ++;
-		else if(op_.getOperator() == BarrierExpressionOP.op_repeat)
-			count_repeat ++;
-	}
-	
-	public BarrierExpression(String func){
-		init();
-		type = BE_func;
-		funcName_ = func;
-		count_node ++;
-	}
-	
-	public BarrierExpression(int id){
-		init();
-		if(id == BE_bot) type = id;
-		else {
-			type = BE_ID;
-			barrierID = id;
-		}
-		count_node ++;
-	}
-	
-	
-	private void init(){
-		op_ = null;
-		operand1_ = null;
-		operand2_ = null;
-		length = -1;
-		type = -1;
-		barrierID = 0;
-		funcName_ = null;
-		parent_ = null;
-		visited = false;
-		ceVisited = false;
-	}
-	
-	public void setOperand1(BarrierExpression op1){
-		op1.setParent(this);
-		operand1_ = op1;
-	}
-	
-	public void setOperand2(BarrierExpression op2){
-		op2.setParent(this);
-		operand2_ = op2;
-	}
-	
-	public BarrierExpression getOP1(){return operand1_;}
-	public BarrierExpression getOP2(){return operand2_;}
-	public BarrierExpression getParent(){return parent_;}
-	
-	public int getLength() {return length;}
-	public void setLength(int l){length = l;} 
-	
-	public void setParent(BarrierExpression parent){
-		this.parent_ = parent;
-	}
-	
-	public boolean isBot() {return type == BE_bot;}
-	public boolean isBarrier() {return type == BE_ID;}
-	public boolean isFunc() {return type == BE_func;}
-	
-	public BarrierExpressionOP getOP(){return op_;}
-	public int getBarrierID() {return barrierID;}
-	public String getFuncName() {return funcName_;}
-	
-	public void setErrorFlag(boolean val) {error = val;}
-	public boolean getErrorFlag() {return error;}
-	
-	/**
-	 * @return: BE = BE1.BE2
-	 */
-	public static BarrierExpression concatBE(BarrierExpression BE1, BarrierExpression BE2){
-		BarrierExpression be = null;
-		if(BE1.isBot()){
-			be = BE2;
-		} else if(BE2.isBot()){
-			be = BE1;
-		} else{
-			be = new BarrierExpression(BarrierExpressionOP.op_concat, null, null);
-			be.setOperand1(BE1);
-			be.setOperand2(BE2);
-		} 
-		return be;
-	}
-	
-	public static BarrierExpression concatBE(BarrierExpression BE1, 
-											 BarrierExpression BE2,
-											 BarrierExpression BE3){
-		return concatBE(concatBE(BE1, BE2), BE3);
-	}
-
-	/**
-	 * @return: BE' = BE*
-	 */
-	public static BarrierExpression repeatBE(BarrierExpression BE, 
-			IASTExpression cond, IASTStatement stmt){
-		BarrierExpression be = null;
-		if(BE.isBot()){
-			be = BE;
-		} else {
-			be = new BarrierExpression(
-					BarrierExpressionOP.op_repeat, cond, stmt);
-			be.setOperand1(BE);
-		}
-		return be;
-	}
-	
-	/**
-	 * @return: BE = BE1 | BE2
-	 */
-	public static BarrierExpression branchBE(BarrierExpression BE1, 
-												BarrierExpression BE2, 
-												IASTExpression cond, 
-												IASTStatement stmt){
-		BarrierExpression be = null;
-		if(BE1.isBot() && BE2.isBot()){
-			be = BE2;
-		} else{
-			be = new BarrierExpression(
-					BarrierExpressionOP.op_branch, cond, stmt);
-			be.setOperand1(BE1);
-			be.setOperand2(BE2);
-		}
-		return be;			
-	}
-	
-	public String prettyPrinter(){
-		if(op_ != null && op_.operator == BarrierExpressionOP.op_concat){
-			return operand1_.prettyPrinter() + "." + operand2_.prettyPrinter(); //$NON-NLS-1$
-		} else if(op_ != null && op_.operator == BarrierExpressionOP.op_repeat){
-			return "(" + operand1_.prettyPrinter() + ")*"; //$NON-NLS-1$ //$NON-NLS-2$
-		} else if(op_ != null && op_.operator == BarrierExpressionOP.op_branch){
-			return "((" + operand1_.prettyPrinter() + ") | (" + operand2_.prettyPrinter() + "))"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		} else if(type == BE_ID){
-			Integer i = new Integer(barrierID);
-			return i.toString();
-		} else if(type == BE_func){
-			return funcName_;
-		} else if(type == BE_bot){
-			return "(\\bot)"; //$NON-NLS-1$
-		}
-		return null;
-	}
-	public String toString() {
-		return prettyPrinter();
-	}
-	
-	/**
-	 * Barrier Expression Operator
-	 */
-	public class BarrierExpressionOP
-	{
-		public static final int op_concat = 1;
-		public static final int op_repeat = 2;
-		public static final int op_branch = 3;
-		private int operator;
-		private IASTExpression condition_;
-		private IASTStatement condStmt_;
-		
-		public BarrierExpressionOP(){
-			operator = 0;
-			condition_ = null;
-		}
-		
-		public BarrierExpressionOP(int op, IASTExpression cond, IASTStatement stmt){
-			operator = op;
-			condition_ = cond;
-			condStmt_ = stmt;
-		}
-		
-		public boolean withCondition(){ 
-			return operator == op_branch | operator == op_repeat ;
-		}
-		
-		public int getOperator() {return operator;}
-		public IASTExpression getCondition() {return condition_;}
-		public IASTStatement getStatement() {return condStmt_;}
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/BarrierTable.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/BarrierTable.java
deleted file mode 100644
index 044c8c4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/BarrierTable.java
+++ /dev/null

@@ -1,250 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,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.analysis.analysis;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTCastExpression;
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionCallExpression;
-import org.eclipse.cdt.core.dom.ast.IASTIdExpression;
-import org.eclipse.cdt.core.dom.ast.IASTInitializerClause;
-import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTNodeLocation;
-import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.ptp.pldt.common.Artifact;
-import org.eclipse.ptp.pldt.common.util.SourceInfo;
-
-public class BarrierTable {
-	/** 
-	 * Set of barriers for a communicator.
-	 * Key: <String>communicator, Value: set of <BarrierInfo>barriers 
-	 */
-	protected Hashtable<String,List<BarrierInfo>> table_; 
-	protected int commCounter = 0;
-	private static boolean dbg_barrier=false;
-	
-	public BarrierTable(){
-		table_ = new Hashtable<String,List<BarrierInfo>>();
-	}
-	
-	public Hashtable<String,List<BarrierInfo>> getTable(){
-		return table_;
-	}
-	public boolean isEmpty() {return table_.isEmpty();}
-	
-	public BarrierInfo addBarrier(IASTFunctionCallExpression barE, 
-			int id, IResource res, String func){
-		BarrierInfo bar = new BarrierInfo(barE, id, res, func);
-		if(table_.containsKey(bar.getComm())){
-			List<BarrierInfo> list = table_.get(bar.getComm());
-			list.add(bar);
-		} else {
-			List<BarrierInfo> list = new ArrayList<BarrierInfo>();
-			list.add(bar);
-			table_.put(bar.getComm(), list);
-		}
-		return bar;
-	}
-	
-	/**
-	 * @return barrier ID if it is a barrier; -1 otherwise
-	 * <br>BRT barrier ids may not match with OpenMPI 1.3.3 headers?? see setComm()
-	 */ 
-	public int isBarrier(IASTFunctionCallExpression funcE){
-		IASTExpression funcname = funcE.getFunctionNameExpression();
-		String signature = funcname.getRawSignature();
-		if(!signature.equals("MPI_Barrier")) return -1; //$NON-NLS-1$
-		for(Enumeration e = table_.elements(); e.hasMoreElements();){
-			ArrayList list = (ArrayList)e.nextElement();
-			for(Iterator i = list.iterator(); i.hasNext();){
-				BarrierInfo bar = (BarrierInfo)i.next();
-				if(bar.getFunc() == funcE)
-					return bar.getID();
-			}
-		}
-		return -1;
-	}
-
-	public String getComm(int id){
-		for(Enumeration e = table_.elements(); e.hasMoreElements();){
-			ArrayList list = (ArrayList)e.nextElement();
-			for(Iterator i = list.iterator(); i.hasNext();){
-				BarrierInfo bar = (BarrierInfo)i.next();
-				if(bar.getID() == id)
-					return bar.getComm();
-			}
-		}
-		return null;
-	}
-	
-	public BarrierInfo searchBarrierbyID(int id){
-		for(Enumeration e = table_.elements(); e.hasMoreElements();){
-			ArrayList list = (ArrayList)e.nextElement();
-			for(Iterator i = list.iterator(); i.hasNext();){
-				BarrierInfo bar = (BarrierInfo)i.next();
-				if(bar.getID() == id)
-					return bar;
-			}
-		}
-		return null;
-	}
-	
-	
-	
-	public class BarrierInfo{
-		protected String comm_ = null;
-		protected IASTFunctionCallExpression barrier_ = null;
-		protected int id = -1;
-		protected String fileName_ = null;
-		protected SourceInfo sourceInfo_ = null;
-		protected List<BarrierInfo> matchingSet_ = null;
-		protected IResource resource_ = null;
-		protected String enclosingFunc_ = null;
-		
-		public BarrierInfo(IASTFunctionCallExpression funcE, int id, IResource res, String func){
-			barrier_ = funcE;
-			this.id = id;
-			setComm();
-			setSourceInfo();
-			matchingSet_ = new ArrayList<BarrierInfo>();
-			resource_ = res;
-			enclosingFunc_ = func;
-		}
-		
-		/**
-		 * Determine the communicator from the the barrier function call
-		 * ("MPI_Barrier(communicator)"). <br>
-		 * If the communicator is the default (MPI_COMM_WORLD), then the type of
-		 * the returned object from getOperand() depends on how the header file
-		 * defines it (In windows, it is IASTLiteralExpression, and in Linux, it
-		 * becomes IASTIdExpression). So we account for that here.
-		 * 
-		 * BRT clarification: 09/09/09
-		 * OpenMPI < 1.3? defines MPI_COMM_WORLD as:
-		 *   #define MPI_COMM_WORLD (&ompi_mpi_comm_world)
-		 * OpenMPI 1.3.3 defines MPI_COMM_WORLD as:
-		 *   #define MPI_COMM_WORLD OMPI_PREDEFINED_GLOBAL( MPI_Comm, ompi_mpi_comm_world)
-		 * which makes the CDT objects for the barrier/communicator show up differently when it gets here.
-		 *   It shows up as an IASTCastExpression, so we recognize that and get its name,
-		 *   instead of relying on the default fallback plan here, which seems to always
-		 *   make each barrier/communicator found be unique, in which case no barriers match, because their
-		 *   communicators all look different.
-		 *   
-		 *   Problem: for the case of #define newcomm MPI_COMM_WORLD
-		 *   I don't want the getRawSignature() on the communicator arg, i want the
-		 *   pre-processed value.  How to get that?
-		 */
-		protected void setComm() { 
-			IASTExpression parameter = barrier_.getParameterExpression(); 
-			IASTInitializerClause[] newParms = barrier_.getArguments(); // BRT could fix deprecation?
-			
-			if (parameter instanceof IASTUnaryExpression) {  
-				IASTUnaryExpression commExpr = (IASTUnaryExpression) parameter;
-				IASTExpression commOp=commExpr.getOperand();
-				if (commOp instanceof IASTUnaryExpression) {  
-					if(dbg_barrier)System.out.println("setComm(): communicator is IASTUnaryExpression"); //$NON-NLS-1$
-					//IASTUnaryExpression commOprd = (IASTUnaryExpression) commOp;
-					if (commOp instanceof IASTLiteralExpression) {//Yuan says windows
-						if(dbg_barrier)System.out.println();
-						IASTLiteralExpression comm = (IASTLiteralExpression) commOp;
-						comm_ = comm.toString();
-					} else if (commOp instanceof IASTIdExpression) { //Yuan says linux
-						IASTIdExpression comm = (IASTIdExpression) commOp;
-						comm_ = comm.getName().toString();
-					} else if (commOp instanceof IASTName) {//?
-						comm_ = commOp.toString();
-					} else {
-						
-						if(commOp instanceof IASTUnaryExpression) {// Mac OSX Openmpi < 1.3 (/usr/include/mpi.h) // 4/14/10: got here OMPI 1.3.3
-							IASTUnaryExpression iastUnaryExpression = (IASTUnaryExpression) commOp;
-							if(dbg_barrier)System.out.println("bdbg: communicator is IASTUnaryExpression"); //$NON-NLS-1$
-							comm_= iastUnaryExpression.getRawSignature();
-							
-						} else {
-							// last resort: use a unique name, but it won't
-							// match anything??
-							comm_ = "COMM_" + commCounter; //$NON-NLS-1$
-							commCounter++;
-						}
-					}
-				} else {
-					if(commOp instanceof IASTCastExpression) {//MAC OSX Openmpi 1.3.3 ;mpich2
-						IASTCastExpression iastCastExpression = (IASTCastExpression) commOp;
-						comm_ = iastCastExpression.getRawSignature();
-					}
-					else{
-						comm_ = "COMM_" + commCounter; //$NON-NLS-1$
-						commCounter++;
-					}
-					
-				}
-			} else if (parameter instanceof IASTIdExpression) {//windows mpich 1.2
-				IASTIdExpression idE = (IASTIdExpression) parameter;
-				comm_ = idE.getName().toString();
-				
-				/* BRT 9/9/09: why hide the actual name? no non-mpi-comm-world comms will match!
-				if (!comm_.equals("MPI_COMM_WORLD")) {
-					comm_ = "COMM_" + commCounter;
-					commCounter++;
-				}
-				*/
-			} else if (parameter instanceof IASTLiteralExpression){// added 9/9/09 for windows/mpich
-				IASTLiteralExpression iastLiteralExpression = (IASTLiteralExpression) parameter;
-				
-				String str=iastLiteralExpression.getRawSignature();
-				comm_=iastLiteralExpression.getRawSignature();
-			}
-			else {
-				comm_ = "COMM_" + commCounter; //$NON-NLS-1$
-				commCounter++;
-			}
-			if(dbg_barrier)System.out.println("setComm(): communicator: "+comm_); //$NON-NLS-1$
-		}
-	
-		
-		protected void setSourceInfo() {
-			IASTExpression funcNameE = barrier_.getFunctionNameExpression();
-			IASTNodeLocation[] locations = funcNameE.getNodeLocations();
-			if (locations.length == 1) {
-				IASTFileLocation astFileLocation = null;
-				if (locations[0] instanceof IASTFileLocation) {
-					astFileLocation = (IASTFileLocation) locations[0];
-					fileName_ = astFileLocation.getFileName();
-					//System.out.println(fileName_);
-					sourceInfo_ = new SourceInfo();
-					sourceInfo_.setStartingLine(astFileLocation.getStartingLineNumber());
-					sourceInfo_.setStart(astFileLocation.getNodeOffset());
-					sourceInfo_.setEnd(astFileLocation.getNodeOffset() + astFileLocation.getNodeLength());
-					sourceInfo_.setConstructType(Artifact.FUNCTION_CALL);
-				}
-			}
-		}
-		
-		public String getComm() {return comm_;}
-		public IASTFunctionCallExpression getFunc() {return barrier_;}
-		public int getID() {return id;}
-		public String getFileName() {return fileName_;}
-		public SourceInfo getSourceInfo() {return sourceInfo_;}
-		public List<BarrierInfo> getMatchingSet() {return matchingSet_;}
-		public IResource getResource() {return resource_;}
-		public String getEnclosingFunc() {return enclosingFunc_;}
-	}
-	
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/GotoEliminator.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/GotoEliminator.java
deleted file mode 100644
index 654e150..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/GotoEliminator.java
+++ /dev/null

@@ -1,1224 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis.analysis;
-
-import java.util.LinkedList;
-import java.util.ListIterator;
-
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression;
-import org.eclipse.cdt.core.dom.ast.IASTBreakStatement;
-import org.eclipse.cdt.core.dom.ast.IASTCaseStatement;
-import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement;
-import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier;
-import org.eclipse.cdt.core.dom.ast.IASTDeclarationStatement;
-import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
-import org.eclipse.cdt.core.dom.ast.IASTDoStatement;
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTExpressionStatement;
-import org.eclipse.cdt.core.dom.ast.IASTForStatement;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
-import org.eclipse.cdt.core.dom.ast.IASTGotoStatement;
-import org.eclipse.cdt.core.dom.ast.IASTIdExpression;
-import org.eclipse.cdt.core.dom.ast.IASTIfStatement;
-import org.eclipse.cdt.core.dom.ast.IASTInitializerExpression;
-import org.eclipse.cdt.core.dom.ast.IASTLabelStatement;
-import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclSpecifier;
-import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.cdt.core.dom.ast.IASTSwitchStatement;
-import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
-import org.eclipse.cdt.core.dom.ast.IASTWhileStatement;
-import org.eclipse.cdt.internal.core.dom.parser.c.CASTBinaryExpression;
-import org.eclipse.cdt.internal.core.dom.parser.c.CASTBreakStatement;
-import org.eclipse.cdt.internal.core.dom.parser.c.CASTCompoundStatement;
-import org.eclipse.cdt.internal.core.dom.parser.c.CASTDeclarationStatement;
-import org.eclipse.cdt.internal.core.dom.parser.c.CASTDoStatement;
-import org.eclipse.cdt.internal.core.dom.parser.c.CASTExpressionStatement;
-import org.eclipse.cdt.internal.core.dom.parser.c.CASTForStatement;
-import org.eclipse.cdt.internal.core.dom.parser.c.CASTIdExpression;
-import org.eclipse.cdt.internal.core.dom.parser.c.CASTIfStatement;
-import org.eclipse.cdt.internal.core.dom.parser.c.CASTInitializerExpression;
-import org.eclipse.cdt.internal.core.dom.parser.c.CASTLiteralExpression;
-import org.eclipse.cdt.internal.core.dom.parser.c.CASTName;
-import org.eclipse.cdt.internal.core.dom.parser.c.CASTSimpleDeclSpecifier;
-import org.eclipse.cdt.internal.core.dom.parser.c.CASTSimpleDeclaration;
-import org.eclipse.cdt.internal.core.dom.parser.c.CASTSwitchStatement;
-import org.eclipse.cdt.internal.core.dom.parser.c.CASTUnaryExpression;
-import org.eclipse.cdt.internal.core.dom.parser.c.CASTWhileStatement;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraph;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraphNode;
-
-public class GotoEliminator{
-
-	private ICallGraph cg_;
-	private LinkedList gotoList_;
-	private LinkedList labelList_;
-	
-	private ICallGraphNode currentNode_;
-	
-	private int switch_count = 0;
-	
-	public GotoEliminator(ICallGraph cg){
-		cg_ = cg;
-		gotoList_ = null;
-		labelList_ = null;
-		currentNode_ = null;
-	}
-	
-	public void run(){
-		for(ICallGraphNode node = cg_.botEntry(); node != null; node = node.botNext()){
-			currentNode_ = node;
-			normalizeCompoundStmt(node.getFuncDef().getBody());
-			GotoLabelCollector glc = new GotoLabelCollector(node);
-			gotoList_ = glc.getGotoList();
-			labelList_ = glc.getLabelList();
-			if(gotoList_.size() == 0) continue;
-			
-			gotoPreprocessing();
-			labelPreprocessing();
-			while(gotoList_.size() > 0){
-				IASTGotoStatement gotoS = (IASTGotoStatement)gotoList_.remove();
-				IASTLabelStatement label = findLabel(gotoS);
-				if(label == null){
-					System.out.println("Empty goto label!"); //$NON-NLS-1$
-					continue;
-				}
-				
-				while(!isDirectedRelated(gotoS, label) && !isSibling(gotoS, label)){
-					moveOutward(gotoS);
-				}
-				if(isDirectedRelated(gotoS, label)){
-					if(Level(gotoS) > Level(label)){
-						while(Level(gotoS) > Level(label))
-							moveOutward(gotoS);
-					}
-					else{
-						while(!Offset(gotoS, label))
-							lifting(gotoS);
-						while(Level(gotoS) < Level(label))
-							moveInward(gotoS);
-					}
-				} 
-				
-				eliminatingGoto(gotoS);
-			}
-			
-			while(labelList_.size() > 0){
-				IASTLabelStatement label = (IASTLabelStatement)labelList_.remove();
-				eliminatingStatement(label);
-			}
-		}
-	}
-	
-	private void labelPreprocessing(){
-		for(ListIterator li = labelList_.listIterator(); li.hasNext();){
-			IASTLabelStatement label = (IASTLabelStatement)li.next();
-			IASTName labelname = label.getName();
-			String labelvar = "goto_" + labelname.toString(); //$NON-NLS-1$
-			createDeclaration(labelvar);
-			setLabelVariable(labelvar, label);
-		}
-	}
-	
-	private void gotoPreprocessing(){
-		for(ListIterator li = gotoList_.listIterator(); li.hasNext();){
-			IASTGotoStatement gotoS = (IASTGotoStatement)li.next();
-			if(!(gotoS.getParent() instanceof IASTIfStatement)){
-				IASTLiteralExpression condE = new CASTLiteralExpression();
-				condE.setValue("true"); //$NON-NLS-1$
-				
-				IASTIfStatement ifS = new CASTIfStatement();
-				ifS.setConditionExpression(condE);
-				condE.setParent(ifS);
-				ifS.setThenClause(gotoS);
-				ifS.setElseClause(null);
-				gotoS.setParent(ifS);
-				
-				replaceStatement(gotoS, ifS);
-			}
-		}
-	}
-	
-	private void createDeclaration(String var){
-		IASTSimpleDeclaration decl = new CASTSimpleDeclaration();
-		
-	    IASTSimpleDeclSpecifier declSpec = new CASTSimpleDeclSpecifier();
-        declSpec.setConst(false);
-        declSpec.setVolatile(false);
-        declSpec.setInline(false);
-        declSpec.setStorageClass(IASTDeclSpecifier.sc_unspecified);
-        declSpec.setType(IASTSimpleDeclSpecifier.t_int);
-        declSpec.setLong(false);
-        declSpec.setUnsigned(false);
-        declSpec.setSigned(true);
-        declSpec.setShort(false);
-	    
-	    decl.setDeclSpecifier(declSpec);
-	    declSpec.setParent(decl);
-	    declSpec.setPropertyInParent(IASTSimpleDeclaration.DECL_SPECIFIER);
-	    IASTDeclarator [] declarators = new IASTDeclarator[1];
-	    IASTName name = new CASTName(var.toCharArray());
-	    declarators[0].setName(name);
-	    IASTLiteralExpression init = new CASTLiteralExpression();
-	    init.setValue("0"); //$NON-NLS-1$
-	    IASTInitializerExpression initE = new CASTInitializerExpression();
-	    initE.setExpression(init);
-	    declarators[0].setInitializer(initE);
-	    
-	    decl.addDeclarator(declarators[0]);
-        declarators[0].setParent(decl);
-        declarators[0].setPropertyInParent(IASTSimpleDeclaration.DECLARATOR);
-        
-        IASTDeclarationStatement declStmt = new CASTDeclarationStatement();
-        declStmt.setDeclaration(decl);
-        
-        IASTCompoundStatement body = (IASTCompoundStatement)currentNode_.getFuncDef().getBody();
-        IASTStatement[] stmts = body.getStatements();
-        body.addStatement(stmts[stmts.length-1]);
-        for(int i=stmts.length-1; i>0; i--){
-        	stmts[i] = stmts[i-1];
-        }
-        stmts[0] = declStmt;
-        stmts[0].setParent(stmts[1].getParent());
-        stmts[0].setPropertyInParent(stmts[1].getPropertyInParent());
-	}
-	
-	private void setLabelVariable(String var, IASTLabelStatement label){
-		IASTName name = new CASTName(var.toCharArray());
-		IASTIdExpression id = new CASTIdExpression();
-		id.setName(name);
-		name.setParent(id);
-
-		IASTLiteralExpression value = new CASTLiteralExpression();
-		value.setValue("0"); //$NON-NLS-1$
-
-		IASTBinaryExpression biE = new CASTBinaryExpression();
-		biE.setOperand1(id);
-		biE.setOperand2(value);
-		id.setParent(biE);
-		value.setParent(biE);
-		biE.setOperator(IASTBinaryExpression.op_assign);
-		
-		IASTExpressionStatement exprStmt = new CASTExpressionStatement();
-		exprStmt.setExpression(biE);
-		biE.setParent(exprStmt);
-		
-		IASTCompoundStatement compStmt = new CASTCompoundStatement();
-		if(label.getNestedStatement() != null){
-			IASTStatement nestedStmt = label.getNestedStatement();
-			compStmt.setParent(nestedStmt.getParent());
-			compStmt.setPropertyInParent(nestedStmt.getPropertyInParent());
-			compStmt.addStatement(exprStmt);
-			compStmt.addStatement(nestedStmt);
-		}
-		else {
-			compStmt.addStatement(exprStmt);
-			compStmt.setParent(label);
-		}
-		label.setNestedStatement(compStmt);
-	}
-	
-	
-	private IASTLabelStatement findLabel(IASTGotoStatement gotoS){
-		IASTName labelname = gotoS.getName();
-		for(ListIterator li = labelList_.listIterator(); li.hasNext();){
-			IASTLabelStatement s = (IASTLabelStatement)li.next();
-			if(s.getName().toString().equals(labelname.toString()))
-				return s;
-		}
-		return null;
-	}
-
-	private boolean isSibling(IASTNode s1, IASTNode s2){
-		IASTNode p1 = s1.getParent();
-		IASTNode p2 = s2.getParent();
-		if(p1 == p2 && p1 instanceof IASTCompoundStatement)
-			return true;
-		else
-			return false;
-	}
-	
-	
-	private boolean isDirectedRelated(IASTGotoStatement gotoS, 
-			IASTLabelStatement labelS){
-		IASTNode parent;
-		parent = gotoS.getParent();
-		while(!(parent instanceof IASTFunctionDefinition)){
-			if(isSibling(labelS, parent)) return true;
-			else parent = parent.getParent();
-		}
-		parent = labelS.getParent();
-		while(!(parent instanceof IASTFunctionDefinition)){
-			if(isSibling(gotoS, parent)) return true;
-			else parent = parent.getParent();
-		}
-		return false;
-	}
-	
-	/* Delete redundantly nested compoundStatement 
-	 * e.g. {{{s}}} --> {s}
-	 * e.g. {{s1}{s2}} --> {s1 s2} 
-	 */
-	private void normalizeCompoundStmt(IASTStatement stmt){
-		if(stmt instanceof IASTCompoundStatement){
-			IASTCompoundStatement newCompS = new CASTCompoundStatement();
-			IASTStatement stmts[] = ((IASTCompoundStatement)stmt).getStatements();
-			for(int i = 0; i<stmts.length; i++){
-				normalizeCompoundStmt(stmts[i]);
-				if(stmts[i] instanceof IASTCompoundStatement){
-					IASTCompoundStatement subCompS = (IASTCompoundStatement)stmts[i];
-					IASTStatement subStmts[] = subCompS.getStatements();
-					for(int j=0; j<subStmts.length; j++){
-						newCompS.addStatement(subStmts[j]);
-						subStmts[j].setParent(newCompS); // TODO: check here
-					}
-				} else {
-					newCompS.addStatement(stmts[i]);
-					stmts[i].setParent(newCompS); // TODO: check here
-				}
-			}
-			replaceStatement(stmt, newCompS);
-		} 
-		else if(stmt instanceof IASTDoStatement){
-			normalizeCompoundStmt(((IASTDoStatement)stmt).getBody());
-		} 
-		else if(stmt instanceof IASTForStatement){
-			normalizeCompoundStmt(((IASTForStatement)stmt).getBody());
-		} 
-		else if(stmt instanceof IASTIfStatement){
-			normalizeCompoundStmt(((IASTIfStatement)stmt).getThenClause());
-			normalizeCompoundStmt(((IASTIfStatement)stmt).getElseClause());
-		} 
-		else if(stmt instanceof IASTSwitchStatement){
-			normalizeCompoundStmt(((IASTSwitchStatement)stmt).getBody());
-		} 
-		else if(stmt instanceof IASTWhileStatement){
-			normalizeCompoundStmt(((IASTWhileStatement)stmt).getBody());
-		}
-	}
-	
-	
-	/* TODO: check the order of replace and parent setting */	
-	private void moveOutward(IASTGotoStatement gotoS){
-		String labelname = "goto_" + gotoS.getName().toString(); //$NON-NLS-1$
-		IASTNode parent = gotoS.getParent().getParent();
-		IASTNode body = gotoS.getParent();
-		IASTIfStatement gotoIfStmt = (IASTIfStatement)body;
-		
-		while(!(parent instanceof IASTFunctionDefinition)){
-			
-			if(parent instanceof IASTDoStatement || 
-					parent instanceof IASTForStatement ||
-					parent instanceof IASTWhileStatement || 
-					parent instanceof IASTSwitchStatement){
-				IASTCompoundStatement newbody = new CASTCompoundStatement();
-				if(body instanceof IASTCompoundStatement){
-					IASTStatement[] stmts = ((IASTCompoundStatement)body).getStatements();
-					int index;
-					for(index=0; index<stmts.length; index++){
-						if(stmts[index] == gotoIfStmt) break;
-					}
-					
-					for(int j=0; j<index; j++){
-						newbody.addStatement(stmts[j]);
-					}
-					IASTStatement assignS = makeGotoIfCondStoreStmt(gotoIfStmt.getConditionExpression(), labelname);
-					newbody.addStatement(assignS);
-					
-					IASTName condname = new CASTName(labelname.toCharArray());
-					IASTIdExpression condE = new CASTIdExpression();
-					condE.setName(condname);
-					condname.setParent(condE);
-					
-					IASTIfStatement ifS = new CASTIfStatement();
-					ifS.setConditionExpression(condE);
-					IASTBreakStatement breakS = new CASTBreakStatement();
-					ifS.setThenClause(breakS);
-					ifS.setElseClause(null);
-					condE.setParent(ifS);
-					breakS.setParent(ifS);
-					
-					newbody.addStatement(ifS);
-					
-					for(int j=index+1; j<stmts.length; j++){
-						newbody.addStatement(stmts[j]);
-					}
-				}
-				else if(body == gotoIfStmt){
-					IASTStatement assignS = makeGotoIfCondStoreStmt(gotoIfStmt.getConditionExpression(), labelname);
-					newbody.addStatement(assignS);
-					
-					IASTName condname = new CASTName(labelname.toCharArray());
-					IASTIdExpression condE = new CASTIdExpression();
-					condE.setName(condname);
-					condname.setParent(condE);
-					
-					IASTIfStatement ifS = new CASTIfStatement();
-					ifS.setConditionExpression(condE);
-					IASTBreakStatement breakS = new CASTBreakStatement();
-					ifS.setThenClause(breakS);
-					ifS.setElseClause(null);
-					condE.setParent(ifS);
-					breakS.setParent(ifS);
-					
-					newbody.addStatement(ifS);
-				}
-				
-				if(parent instanceof IASTDoStatement){
-					((CASTDoStatement)parent).replace(body, newbody);
-				} else if(parent instanceof IASTForStatement){
-					((CASTForStatement)parent).replace(body, newbody);
-				} else if(parent instanceof IASTWhileStatement){
-					((CASTWhileStatement)parent).replace(body, newbody);
-				} else if(parent instanceof IASTSwitchStatement){
-					((CASTSwitchStatement)parent).replace(body, newbody);
-				}
-
-				IASTStatement newIfStmt = makeNewGotoIfStmt(labelname, gotoS);
-				appendStatement(newIfStmt, (IASTStatement)parent);
-				
-				break;
-			}
-			else if(parent instanceof IASTIfStatement){
-				if(body instanceof IASTCompoundStatement){
-					IASTStatement[] stmts = ((IASTCompoundStatement)body).getStatements();
-					int index;
-					for(index=0; index<stmts.length; index++){
-						if(stmts[index] == gotoIfStmt) break;
-					}
-					
-					IASTCompoundStatement newbody = new CASTCompoundStatement();
-					for(int j=0; j<index; j++){
-						newbody.addStatement(stmts[j]);
-					}
-					IASTStatement assignS = makeGotoIfCondStoreStmt(gotoIfStmt.getConditionExpression(), labelname);
-					newbody.addStatement(assignS);
-					
-					if(index < stmts.length-1){ //some statements after the goto
-						IASTCompoundStatement ifbody = new CASTCompoundStatement();
-						for(int j = index+1; j<stmts.length; j++){
-							ifbody.addStatement(stmts[j]);
-						}
-						IASTName condname = new CASTName(labelname.toCharArray());
-						IASTIdExpression condid = new CASTIdExpression();
-						condid.setName(condname);
-						condname.setParent(condid);
-						
-						IASTUnaryExpression condE = new CASTUnaryExpression();
-						condE.setOperand(condid);
-						condE.setOperator(IASTUnaryExpression.op_not);
-						condid.setParent(condE);
-						
-						IASTIfStatement ifStmt = new CASTIfStatement();
-						ifStmt.setConditionExpression(condE);
-						ifStmt.setThenClause(ifbody);
-						ifStmt.setElseClause(null);
-						condE.setParent(ifStmt);
-						ifbody.setParent(ifStmt);
-						
-						newbody.addStatement(ifStmt);
-					}
-					
-					((CASTIfStatement)parent).replace(body, newbody);
-				}
-				else if(body == gotoIfStmt){
-					IASTStatement assignS = makeGotoIfCondStoreStmt(gotoIfStmt.getConditionExpression(), labelname);
-					((CASTIfStatement)parent).replace(gotoIfStmt, assignS);
-				}
-					
-				IASTStatement newifStmt = makeNewGotoIfStmt(labelname, gotoS);
-				appendStatement(newifStmt, (IASTStatement)parent); 
-				 
-				break;
-			}
-			else {
-				body = parent;
-				parent = body.getParent();
-			}
-		}
-	}
-	
-	
-	private void moveInward(IASTGotoStatement gotoS){
-		IASTIfStatement gotoIfStmt = (IASTIfStatement)gotoS.getParent();
-		String labelname = "goto_" + gotoS.getName().toString(); //$NON-NLS-1$
-		IASTLabelStatement label = findLabel(gotoS);
-		IASTStatement enclosingStmt = null;
-		IASTStatement clause = null;
-		IASTNode parent = label.getParent();
-		IASTNode temp = label;
-		while(!(parent instanceof IASTFunctionDefinition)){
-			if(parent instanceof IASTDoStatement || 
-					parent instanceof IASTForStatement ||
-					parent instanceof IASTWhileStatement ||
-					parent instanceof IASTSwitchStatement ||
-					parent instanceof IASTIfStatement){
-				enclosingStmt = (IASTStatement)parent;
-				if(parent instanceof IASTIfStatement)
-					clause = (IASTStatement)temp;
-			}
-			if(parent == gotoIfStmt.getParent()) break;
-			else{
-				temp = parent;
-				parent = temp.getParent();
-			}
-		}
-		
-		if(enclosingStmt instanceof IASTDoStatement ||
-				enclosingStmt instanceof IASTForStatement ||
-				enclosingStmt instanceof IASTWhileStatement ){
-			/* parent should be a CompoundStatement */
-			int gotoindex = -1;
-			int loopindex = -1;
-			IASTStatement[] stmts = ((IASTCompoundStatement)parent).getStatements();
-			for(int i = 0; i<stmts.length; i++){
-				if(stmts[i] == gotoIfStmt) gotoindex = i;
-				else if(stmts[i] == enclosingStmt) loopindex = i;
-			}
-			
-			IASTCompoundStatement newParentStmt = new CASTCompoundStatement();
-			
-			for(int i=0; i<gotoindex; i++){
-				newParentStmt.addStatement(stmts[i]);
-				stmts[i].setParent(newParentStmt);
-			}
-			IASTStatement assignS = makeGotoIfCondStoreStmt(gotoIfStmt.getConditionExpression(), labelname);
-			newParentStmt.addStatement(assignS);
-			assignS.setParent(newParentStmt);
-			
-			if(loopindex - gotoindex > 1){
-				IASTName condname = new CASTName(labelname.toCharArray());
-				IASTIdExpression condid = new CASTIdExpression();
-				condid.setName(condname);
-				condname.setParent(condid);
-				IASTUnaryExpression condE = new CASTUnaryExpression();
-				condE.setOperand(condid);
-				condE.setOperator(IASTUnaryExpression.op_not);
-				condid.setParent(condE);
-				
-				IASTCompoundStatement ifbody = new CASTCompoundStatement();
-				for(int i=gotoindex+1; i<loopindex; i++){
-					ifbody.addStatement(stmts[i]);
-					stmts[i].setParent(ifbody);
-				}
-				
-				IASTIfStatement newIfStmt = new CASTIfStatement();
-				newIfStmt.setConditionExpression(condE);
-				newIfStmt.setThenClause(ifbody);
-				newIfStmt.setElseClause(null);
-				condE.setParent(newIfStmt);
-				ifbody.setParent(newIfStmt);
-				
-				newParentStmt.addStatement(newIfStmt);
-				newIfStmt.setParent(newParentStmt);
-			}	
-			
-			IASTName loopcondname = new CASTName(labelname.toCharArray());
-			IASTIdExpression loopcondid = new CASTIdExpression();
-			loopcondid.setName(loopcondname);
-			loopcondname.setParent(loopcondid);
-			
-			IASTStatement loopbody = null;
-			if(enclosingStmt instanceof IASTDoStatement){
-				IASTDoStatement doloop = (IASTDoStatement)enclosingStmt;
-				IASTBinaryExpression newCondE = new CASTBinaryExpression();
-				IASTExpression oldCondE = doloop.getCondition();
-				newCondE.setOperand1(oldCondE);
-				newCondE.setOperand2(loopcondid);
-				newCondE.setOperator(IASTBinaryExpression.op_logicalOr);
-				oldCondE.setParent(newCondE);
-				loopcondid.setParent(newCondE);
-				((CASTDoStatement)doloop).replace(oldCondE, newCondE);
-				loopbody = doloop.getBody();
-			} else if(enclosingStmt instanceof IASTForStatement){
-				IASTForStatement forloop = (IASTForStatement)enclosingStmt;
-				IASTBinaryExpression newCondE = new CASTBinaryExpression();
-				IASTExpression oldCondE = forloop.getConditionExpression();
-				newCondE.setOperand1(oldCondE);
-				newCondE.setOperand2(loopcondid);
-				newCondE.setOperator(IASTBinaryExpression.op_logicalOr);
-				oldCondE.setParent(newCondE);
-				loopcondid.setParent(newCondE);
-				((CASTForStatement)forloop).replace(oldCondE, newCondE);
-				loopbody = forloop.getBody();
-			} else if(enclosingStmt instanceof IASTWhileStatement){
-				IASTWhileStatement whileloop = (IASTWhileStatement)enclosingStmt;
-				IASTBinaryExpression newCondE = new CASTBinaryExpression();
-				IASTExpression oldCondE = whileloop.getCondition();
-				newCondE.setOperand1(oldCondE);
-				newCondE.setOperand2(loopcondid);
-				newCondE.setOperator(IASTBinaryExpression.op_logicalOr);
-				oldCondE.setParent(newCondE);
-				loopcondid.setParent(newCondE);
-				((CASTWhileStatement)whileloop).replace(oldCondE, newCondE);
-				loopbody = whileloop.getBody();
-			}
-			
-			IASTCompoundStatement newloopbody = new CASTCompoundStatement();
-			IASTStatement newGotoS = makeNewGotoIfStmt(labelname, gotoS);
-			newloopbody.addStatement(newGotoS);
-			newGotoS.setParent(newloopbody);
-			if(loopbody instanceof IASTCompoundStatement){
-				IASTStatement[] bodyStmts = ((IASTCompoundStatement)loopbody).getStatements();
-				for(int i = 0; i<bodyStmts.length; i++){
-					newloopbody.addStatement(bodyStmts[i]);
-					bodyStmts[i].setParent(newloopbody);
-				}
-			}
-			else if(loopbody == label){
-				newloopbody.addStatement(label);
-				label.setParent(newloopbody);
-			}
-			
-			if(enclosingStmt instanceof IASTDoStatement){
-				((CASTDoStatement)enclosingStmt).replace(loopbody, newloopbody);
-			} else if(enclosingStmt instanceof IASTForStatement){
-				((CASTForStatement)enclosingStmt).replace(loopbody, newloopbody);
-			} else if(enclosingStmt instanceof IASTWhileStatement){
-				((CASTWhileStatement)enclosingStmt).replace(loopbody, newloopbody);
-			}
-			
-			newParentStmt.addStatement(enclosingStmt);
-			enclosingStmt.setParent(newParentStmt);
-			
-			for(int i = loopindex+1; i<stmts.length; i++){
-				newParentStmt.addStatement(stmts[i]);
-				stmts[i].setParent(newParentStmt);
-			}
-			replaceStatement((IASTStatement)parent, newParentStmt);
-
-		}
-		else if(enclosingStmt instanceof IASTIfStatement){
-			/* parent must be a compoundStatement */
-			IASTStatement[] stmts = ((IASTCompoundStatement)parent).getStatements();
-			int gotoindex = -1;
-			int ifindex = -1;
-			for(int i=0; i<stmts.length; i++){
-				if(stmts[i] == gotoIfStmt) gotoindex = i;
-				else if(stmts[i] == enclosingStmt) ifindex = i;
-			}
-			
-			IASTCompoundStatement newParentStmt = new CASTCompoundStatement();
-			
-			for(int i=0; i<gotoindex; i++){
-				newParentStmt.addStatement(stmts[i]);
-				stmts[i].setParent(newParentStmt);
-			}
-			IASTStatement assignS = makeGotoIfCondStoreStmt(gotoIfStmt.getConditionExpression(), labelname);
-			newParentStmt.addStatement(assignS);
-			assignS.setParent(newParentStmt);
-			
-			if(ifindex - gotoindex > 1){
-				IASTName condname = new CASTName(labelname.toCharArray());
-				IASTIdExpression condid = new CASTIdExpression();
-				condid.setName(condname);
-				condname.setParent(condid);
-				IASTUnaryExpression condE = new CASTUnaryExpression();
-				condE.setOperand(condid);
-				condE.setOperator(IASTUnaryExpression.op_not);
-				condid.setParent(condE);
-				
-				IASTCompoundStatement ifbody = new CASTCompoundStatement();
-				for(int i=gotoindex+1; i<ifindex; i++){
-					ifbody.addStatement(stmts[i]);
-					stmts[i].setParent(ifbody);
-				}
-				
-				IASTIfStatement newIfStmt = new CASTIfStatement();
-				newIfStmt.setConditionExpression(condE);
-				newIfStmt.setThenClause(ifbody);
-				newIfStmt.setElseClause(null);
-				condE.setParent(newIfStmt);
-				ifbody.setParent(newIfStmt);
-				
-				newParentStmt.addStatement(newIfStmt);
-				newIfStmt.setParent(newParentStmt);
-			}
-			
-			IASTExpression oldIfCond = ((IASTIfStatement)enclosingStmt).getConditionExpression();
-			IASTName ifcondname = new CASTName(labelname.toCharArray());
-			IASTIdExpression ifcondid = new CASTIdExpression();
-			ifcondid.setName(ifcondname);
-			ifcondname.setParent(ifcondid);
-			
-			IASTUnaryExpression ifcondPart1 = new CASTUnaryExpression();
-			ifcondPart1.setOperand(ifcondid);
-			ifcondPart1.setOperator(IASTUnaryExpression.op_not);
-			ifcondid.setParent(ifcondPart1);
-			
-			IASTBinaryExpression newIfCond = new CASTBinaryExpression();
-			newIfCond.setOperator(IASTBinaryExpression.op_logicalAnd);
-			newIfCond.setOperand1(ifcondPart1);
-			newIfCond.setOperand2(oldIfCond);
-			ifcondPart1.setParent(newIfCond);
-			oldIfCond.setParent(newIfCond);
-			
-			((CASTIfStatement)enclosingStmt).replace(oldIfCond, newIfCond);
-			
-			IASTCompoundStatement newClause = new CASTCompoundStatement();
-			IASTStatement newGotoS = makeNewGotoIfStmt(labelname, gotoS);
-			newClause.addStatement(newGotoS);
-			newGotoS.setParent(newClause);
-			if(clause instanceof IASTCompoundStatement){
-				IASTStatement[] clauseStmts = ((IASTCompoundStatement)clause).getStatements();
-				for(int i = 0; i<clauseStmts.length; i++){
-					newClause.addStatement(clauseStmts[i]);
-					clauseStmts[i].setParent(newClause);
-				}
-			}
-			else if(clause == label){
-				newClause.addStatement(label);
-				label.setParent(newClause);
-			}
-			
-			((CASTIfStatement)enclosingStmt).replace(clause, newClause);
-			
-			newParentStmt.addStatement(enclosingStmt);
-			enclosingStmt.setParent(newParentStmt);
-			
-			for(int i = ifindex+1; i<stmts.length; i++){
-				newParentStmt.addStatement(stmts[i]);
-				stmts[i].setParent(newParentStmt);
-			}
-			replaceStatement((IASTStatement)parent, newParentStmt);
-		}
-		else if(enclosingStmt instanceof IASTSwitchStatement){
-			/* parent must be a compoundStatement */
-			IASTStatement[] stmts = ((IASTCompoundStatement)parent).getStatements();
-			int gotoindex = -1;
-			int switchindex = -1;
-			IASTCaseStatement caseStmt = null;
-			boolean casefound = false;
-			
-			for(int i=0; i<stmts.length; i++){
-				if(stmts[i] == gotoIfStmt) gotoindex = i;
-				else if(stmts[i] == enclosingStmt){
-					switchindex = i;
-					casefound = true;
-				}
-				else if(stmts[i] instanceof IASTCaseStatement && !casefound){
-					caseStmt = (IASTCaseStatement)stmts[i];
-				}
-			}
-			
-			IASTCompoundStatement newParentStmt = new CASTCompoundStatement();
-			
-			for(int i=0; i<gotoindex; i++){
-				newParentStmt.addStatement(stmts[i]);
-				stmts[i].setParent(newParentStmt);
-			}
-			IASTStatement assignS = makeGotoIfCondStoreStmt(gotoIfStmt.getConditionExpression(), labelname);
-			newParentStmt.addStatement(assignS);
-			assignS.setParent(newParentStmt);
-			
-			/* making new if statement */
-			IASTName condname = new CASTName(labelname.toCharArray());
-			IASTIdExpression condid = new CASTIdExpression();
-			condid.setName(condname);
-			condname.setParent(condid);
-			IASTUnaryExpression condE = new CASTUnaryExpression();
-			condE.setOperand(condid);
-			condE.setOperator(IASTUnaryExpression.op_not);
-			condid.setParent(condE);
-			
-			IASTCompoundStatement ifThenBody = new CASTCompoundStatement();
-			for(int i=gotoindex+1; i<switchindex; i++){
-				ifThenBody.addStatement(stmts[i]);
-				stmts[i].setParent(ifThenBody);
-			}
-			
-			String switchvar = "t_switch_" + switch_count; //$NON-NLS-1$
-			switch_count ++;
-			createDeclaration(switchvar); /* TODO: fix type information */
-			IASTName switchCondAssignName = new CASTName(switchvar.toCharArray());
-			IASTIdExpression switchCondAssignID = new CASTIdExpression();
-			switchCondAssignID.setName(switchCondAssignName);
-			switchCondAssignName.setParent(switchCondAssignID);
-			IASTExpression oldSwitchCondE = ((IASTSwitchStatement)enclosingStmt).getControllerExpression();
-			
-			IASTBinaryExpression switchCondAssignE = new CASTBinaryExpression();
-			switchCondAssignE.setOperand1(switchCondAssignID);
-			switchCondAssignE.setOperand2(oldSwitchCondE);
-			switchCondAssignE.setOperator(IASTBinaryExpression.op_assign);
-			switchCondAssignID.setParent(switchCondAssignE);
-			oldSwitchCondE.setParent(switchCondAssignE);
-			
-			IASTExpressionStatement switchCondAssignStmt = new CASTExpressionStatement();
-			switchCondAssignStmt.setExpression(switchCondAssignE);
-			switchCondAssignE.setParent(switchCondAssignStmt);
-			
-			ifThenBody.addStatement(switchCondAssignStmt);
-			switchCondAssignStmt.setParent(ifThenBody);
-			
-			IASTName elseSwitchCondName = new CASTName(switchvar.toCharArray());
-			IASTIdExpression elseSwitchCondID = new CASTIdExpression();
-			elseSwitchCondID.setName(elseSwitchCondName);
-			elseSwitchCondName.setParent(elseSwitchCondID);
-			
-			IASTBinaryExpression elseSwitchCondE = new CASTBinaryExpression();
-			elseSwitchCondE.setOperator(IASTBinaryExpression.op_assign);
-			elseSwitchCondE.setOperand1(elseSwitchCondID);
-			elseSwitchCondE.setOperand2(caseStmt.getExpression());
-			elseSwitchCondID.setParent(elseSwitchCondE);
-			caseStmt.getExpression().setParent(elseSwitchCondE);
-			
-			IASTExpressionStatement elseSwitchCondStmt = new CASTExpressionStatement();
-			elseSwitchCondStmt.setExpression(elseSwitchCondE);
-			elseSwitchCondE.setParent(elseSwitchCondStmt);
-			
-			IASTIfStatement newIfStmt = new CASTIfStatement();
-			newIfStmt.setConditionExpression(condE);
-			newIfStmt.setThenClause(ifThenBody);
-			newIfStmt.setElseClause(elseSwitchCondStmt);
-			condE.setParent(newIfStmt);
-			ifThenBody.setParent(newIfStmt);
-			
-			newParentStmt.addStatement(newIfStmt);
-			newIfStmt.setParent(newParentStmt);
-			/* end making new if statement */
-			
-			/* make new switch condition */
-			IASTName switchCondName = new CASTName(switchvar.toCharArray());
-			IASTIdExpression switchCondID = new CASTIdExpression();
-			switchCondID.setName(switchCondName);
-			switchCondName.setParent(switchCondID);
-			
-			((CASTSwitchStatement)enclosingStmt).replace(oldSwitchCondE, switchCondID);
-			/* end make new switch condition */
-			
-			/* make new switch body */
-			IASTCompoundStatement newSwitchBody = new CASTCompoundStatement();
-			IASTStatement oldSwitchBody = ((IASTSwitchStatement)enclosingStmt).getBody();
-			IASTStatement[] oldSwitchBodyStmts = ((IASTCompoundStatement)oldSwitchBody).getStatements();
-			
-			for(int i=0; i<oldSwitchBodyStmts.length; i++){
-				if(oldSwitchBodyStmts[i] != caseStmt){
-					newSwitchBody.addStatement(oldSwitchBodyStmts[i]);
-					oldSwitchBodyStmts[i].setParent(newSwitchBody);
-				} else {
-					newSwitchBody.addStatement(caseStmt);
-					caseStmt.setParent(newSwitchBody);
-					IASTStatement newGotoS = makeNewGotoIfStmt(labelname, gotoS);
-					newSwitchBody.addStatement(newGotoS);
-					newGotoS.setParent(newSwitchBody);
-				}
-			}
-			
-			((CASTSwitchStatement)enclosingStmt).replace(oldSwitchBody, newSwitchBody);
-			
-			newParentStmt.addStatement(enclosingStmt);
-			enclosingStmt.setParent(newParentStmt);
-			
-			for(int i = switchindex+1; i<stmts.length; i++){
-				newParentStmt.addStatement(stmts[i]);
-				stmts[i].setParent(newParentStmt);
-			}
-			replaceStatement((IASTStatement)parent, newParentStmt);
-		}
-	}
-	
-	private void lifting(IASTGotoStatement gotoS){
-		IASTIfStatement gotoIfStmt = (IASTIfStatement)gotoS.getParent();
-		String labelname = "goto_" + gotoS.getName().toString(); //$NON-NLS-1$
-		IASTLabelStatement label = findLabel(gotoS);
-		IASTStatement enclosingStmt = null;
-
-		IASTNode parent = label.getParent();
-		while(!(parent instanceof IASTFunctionDefinition)){
-			if(parent instanceof IASTDoStatement || 
-					parent instanceof IASTForStatement ||
-					parent instanceof IASTWhileStatement ||
-					parent instanceof IASTSwitchStatement ||
-					parent instanceof IASTIfStatement){
-				enclosingStmt = (IASTStatement)parent;
-			}
-			if(parent == gotoIfStmt.getParent()) break;
-			else{
-				parent = parent.getParent();
-			}
-		}
-		
-		/* parent should be a CompoundStatement */
-		IASTStatement[] stmts = ((IASTCompoundStatement)parent).getStatements();
-		int labelindex = -1;
-		int gotoindex = -1;
-		for(int i=0; i<stmts.length; i++){
-			if(stmts[i] == enclosingStmt) labelindex = i;
-			else if(stmts[i] == gotoIfStmt) gotoindex = i;
-		}
-		
-		IASTCompoundStatement newParentStmt = new CASTCompoundStatement();
-		for(int i=0; i<labelindex; i++){
-			newParentStmt.addStatement(stmts[i]);
-			stmts[i].setParent(newParentStmt);
-		}
-		
-		/* make the do loop */
-		IASTCompoundStatement loopbody = new CASTCompoundStatement();
-		IASTStatement ifStmt = makeNewGotoIfStmt(labelname, gotoS);
-		loopbody.addStatement(ifStmt);
-		ifStmt.setParent(loopbody);
-		
-		for(int i=labelindex; i<gotoindex; i++){
-			loopbody.addStatement(stmts[i]);
-			stmts[i].setParent(loopbody);
-		}
-		
-		IASTStatement gotoIfCondStmt = makeGotoIfCondStoreStmt(gotoIfStmt.getConditionExpression(), labelname);
-		loopbody.addStatement(gotoIfCondStmt);
-		gotoIfCondStmt.setParent(loopbody);
-		
-		IASTName condname = new CASTName(labelname.toCharArray());
-		IASTIdExpression condID = new CASTIdExpression();
-		condID.setName(condname);
-		condname.setParent(condID);
-		
-		IASTDoStatement doStmt = new CASTDoStatement();
-		doStmt.setBody(loopbody);
-		doStmt.setCondition(condID);
-		loopbody.setParent(doStmt);
-		condID.setParent(doStmt);
-		/* end make the do loop */
-		
-		newParentStmt.addStatement(doStmt);
-		doStmt.setParent(newParentStmt);
-		
-		for(int i=gotoindex+1; i<stmts.length; i++){
-			newParentStmt.addStatement(stmts[i]);
-			stmts[i].setParent(newParentStmt);
-		}
-		
-		replaceStatement((IASTStatement)parent, newParentStmt);
-	}
-	
-	private void eliminatingGoto(IASTGotoStatement gotoS){
-		/* gotoS and label should have the same parent, and the parent
-		 * should be a compoundStatement
-		 */
-		IASTLabelStatement label = findLabel(gotoS);
-		IASTIfStatement gotoIfStmt = (IASTIfStatement)gotoS.getParent();
-		IASTCompoundStatement parent = (IASTCompoundStatement)gotoS.getParent();
-		IASTStatement[] stmts = parent.getStatements();
-		int gotoindex = -1;
-		int labelindex = -1;
-		for(int i=0; i<stmts.length; i++){
-			if(stmts[i] == gotoIfStmt) gotoindex = i;
-			else if(stmts[i] == label) labelindex = i;
-		}
-		
-		IASTCompoundStatement newCompS = new CASTCompoundStatement();
-		if(gotoindex < labelindex){
-			for(int i=0; i<gotoindex; i++){
-				newCompS.addStatement(stmts[i]);
-				stmts[i].setParent(newCompS);
-			}
-			if(labelindex - gotoindex > 1){
-				IASTCompoundStatement newIfBody = new CASTCompoundStatement();
-				for(int i=gotoindex+1; i<labelindex; i++){
-					newIfBody.addStatement(stmts[i]);
-					stmts[i].setParent(newIfBody);
-				}
-				IASTUnaryExpression newCondE = new CASTUnaryExpression();
-				newCondE.setOperator(IASTUnaryExpression.op_not);
-				newCondE.setOperand(gotoIfStmt.getConditionExpression());
-				gotoIfStmt.getConditionExpression().setParent(newCondE);
-				
-				IASTIfStatement newIfS = new CASTIfStatement();
-				newIfS.setConditionExpression(newCondE);
-				newIfS.setThenClause(newIfBody);
-				newIfS.setElseClause(null);
-				newIfBody.setParent(newIfS);
-				newCondE.setParent(newIfS);
-				
-				newCompS.addStatement(newIfS);
-				newIfS.setParent(newCompS);
-			}
-			
-			for(int i=labelindex; i<stmts.length; i++){
-				newCompS.addStatement(stmts[i]);
-				stmts[i].setParent(newCompS);
-			}
-		}
-		else { //gotoS occurs later than label
-			for(int i=0; i<labelindex; i++){
-				newCompS.addStatement(stmts[i]);
-				stmts[i].setParent(newCompS);
-			}
-
-			IASTCompoundStatement loopbody = new CASTCompoundStatement();
-			loopbody.addStatement(label);
-			label.setParent(loopbody);
-			for(int i=labelindex+1; i<gotoindex; i++){
-				loopbody.addStatement(stmts[i]);
-				stmts[i].setParent(loopbody);
-			}
-			
-			IASTDoStatement newLoopS = new CASTDoStatement();
-			newLoopS.setBody(loopbody);
-			newLoopS.setCondition(gotoIfStmt.getConditionExpression());
-			loopbody.setParent(newLoopS);
-			gotoIfStmt.getConditionExpression().setParent(newLoopS);
-			
-			newCompS.addStatement(newLoopS);
-			newLoopS.setParent(newCompS);
-			
-			for(int i=gotoindex+1; i<stmts.length; i++){
-				newCompS.addStatement(stmts[i]);
-				stmts[i].setParent(newCompS);
-			}
-		}
-		replaceStatement(parent, newCompS);
-	}
-	
-	private void eliminatingStatement(IASTStatement stmt){
-		if(stmt instanceof IASTCompoundStatement){
-			IASTStatement[] stmts = ((IASTCompoundStatement)stmt).getStatements();
-			int validStmt = 0;
-			for(int i=0; i<stmts.length; i++){
-				if(stmts[i] != null) validStmt ++;
-			}
-			if(validStmt == 0){ // no valid statement
-				replaceStatement(stmt, null);
-				eliminatingStatement((IASTStatement)stmt.getParent());
-			}
-			else if(validStmt < stmts.length){ // some statements are not valid
-				IASTCompoundStatement newCompS = new CASTCompoundStatement();
-				for(int i=0; i<stmts.length; i++){
-					if(stmts[i] != null){
-						newCompS.addStatement(stmts[i]);
-						stmts[i].setParent(newCompS);
-					}
-				}
-				replaceStatement(stmt, newCompS);
-			}
-			
-		} else if(stmt instanceof IASTDoStatement){
-			IASTDoStatement doS = (IASTDoStatement)stmt;
-			if(doS.getBody() == null && doS.getCondition() == null){
-				replaceStatement(stmt, null);
-				eliminatingStatement((IASTStatement)stmt.getParent());
-			}
-		} else if(stmt instanceof IASTForStatement){
-			
-		} else if(stmt instanceof IASTIfStatement){
-			IASTIfStatement ifS = (IASTIfStatement)stmt;
-			if(ifS.getThenClause() == null && ifS.getElseClause() == null){
-				replaceStatement(stmt, null);
-				eliminatingStatement((IASTStatement)stmt.getParent());
-			} else if(ifS.getThenClause() == null && ifS.getElseClause() != null){
-				IASTIfStatement newIfS = new CASTIfStatement();
-				IASTUnaryExpression newCondE = new CASTUnaryExpression();
-				newCondE.setOperator(IASTUnaryExpression.op_not);
-				newCondE.setOperand(ifS.getConditionExpression());
-				ifS.getConditionExpression().setParent(newCondE);
-				
-				newIfS.setConditionExpression(newCondE);
-				newIfS.setThenClause(ifS.getElseClause());
-				newIfS.setElseClause(null);
-				ifS.getElseClause().setParent(newIfS);
-				newCondE.setParent(newIfS);
-				
-				replaceStatement(ifS, newIfS);
-			}
-
-		} else if(stmt instanceof IASTLabelStatement){
-			IASTLabelStatement labelS = (IASTLabelStatement)stmt;
-			IASTStatement nestedS = labelS.getNestedStatement();
-			if(nestedS == null){
-				replaceStatement(stmt, null);
-			} else {
-				replaceStatement(stmt, nestedS);
-			}
-			eliminatingStatement((IASTStatement)stmt.getParent());
-		} else if(stmt instanceof IASTSwitchStatement){
-			
-		} else if(stmt instanceof IASTWhileStatement){
-			
-		} else {
-			
-		}
-	}
-	
-	/* return statement "labelname = cond;" */
-	private IASTStatement makeGotoIfCondStoreStmt(IASTExpression cond, String labelname){
-		IASTName assignName = new CASTName(labelname.toCharArray());
-		IASTIdExpression assignID = new CASTIdExpression();
-		assignID.setName(assignName);
-		assignName.setParent(assignID);
-		
-		IASTBinaryExpression assignE = new CASTBinaryExpression();
-		assignE.setOperand1(assignID);
-		assignE.setOperand2(cond);
-		assignE.setOperator(IASTBinaryExpression.op_assign);
-		assignID.setParent(assignE);
-		cond.setParent(assignE);
-		
-		IASTExpressionStatement assignS = new CASTExpressionStatement();
-		assignS.setExpression(assignE);
-		assignE.setParent(assignS);
-		
-		return assignS;
-	}
-	
-	private IASTStatement makeNewGotoIfStmt(String labelname, 
-						IASTGotoStatement gotoS){
-		IASTName condname = new CASTName(labelname.toCharArray());
-		IASTIdExpression condE = new CASTIdExpression();
-		condE.setName(condname);
-		condname.setParent(condE);
-		
-		IASTIfStatement newifStmt = new CASTIfStatement();
-		newifStmt.setConditionExpression(condE);
-		newifStmt.setThenClause(gotoS);
-		newifStmt.setElseClause(null);
-		condE.setParent(newifStmt);
-		gotoS.setParent(newifStmt);
-		
-		return newifStmt;
-	}
-	
-	private void replaceStatement(IASTStatement oldS, IASTStatement newS){
-		IASTNode parent = oldS.getParent();
-		if(parent instanceof IASTCompoundStatement){
-			CASTCompoundStatement compS = (CASTCompoundStatement)parent;
-			compS.replace(oldS, newS);
-		}
-		else if(parent instanceof IASTDoStatement){
-			CASTDoStatement doS = (CASTDoStatement)parent;
-			doS.replace(oldS, newS);
-		}
-		else if(parent instanceof IASTForStatement){
-			CASTForStatement forS = (CASTForStatement)parent;
-			forS.replace(oldS, newS);
-		}
-		else if(parent instanceof IASTIfStatement){
-			CASTIfStatement ifS = (CASTIfStatement)parent;
-			ifS.replace(oldS, newS);
-		}
-		else if(parent instanceof IASTSwitchStatement){
-			CASTSwitchStatement switchS = (CASTSwitchStatement)parent;
-			switchS.replace(oldS, newS);
-		}
-		else if(parent instanceof IASTWhileStatement){
-			CASTWhileStatement whileS = (CASTWhileStatement)parent;
-			whileS.replace(oldS, newS);
-		}
-	}
-	
-	/* append "stmt" right after the "prev" */
-	private void appendStatement(IASTStatement stmt, IASTStatement prev){
-		IASTCompoundStatement newcompS = new CASTCompoundStatement();
-		newcompS.addStatement(prev);
-		newcompS.addStatement(stmt);
-		prev.setParent(newcompS);
-		stmt.setParent(newcompS);
-		replaceStatement(prev, newcompS);
-	}
-	
-	
-	private int Level(IASTStatement stmt){
-		int count = 0;
-		IASTNode parent = stmt.getParent();
-		while(! (parent instanceof IASTFunctionDefinition)){
-			if(parent instanceof IASTIfStatement || 
-					parent instanceof IASTForStatement ||
-					parent instanceof IASTDoStatement ||
-					parent instanceof IASTWhileStatement ||
-					parent instanceof IASTSwitchStatement)
-				count ++;
-			parent = parent.getParent();
-		}
-		return count;
-	}
-	
-	/* return true if gotoS has lower offset than label, false otherwise */
-	private boolean Offset(IASTGotoStatement gotoS, IASTLabelStatement label){
-		OffsetCalculator oc = new OffsetCalculator(currentNode_, gotoS, label);
-		return oc.gotoBFlabel();
-	}
-	
-	
-	class GotoLabelCollector extends ASTVisitor{
-		private ICallGraphNode node_;
-		private LinkedList<IASTStatement> gotoList_;
-		private LinkedList<IASTStatement> labelList_;
-		
-		public GotoLabelCollector(ICallGraphNode node){
-			node_ = node;
-			gotoList_ = new LinkedList<IASTStatement>();
-			labelList_ = new LinkedList<IASTStatement>();
-		}
-		
-		public void run(){
-			this.shouldVisitDeclarations = true;
-			this.shouldVisitStatements = true;
-			IASTStatement body = node_.getFuncDef().getBody();
-			body.accept(this);
-		}
-		
-		public int visit(IASTStatement stmt){
-			if(stmt instanceof IASTGotoStatement)
-				gotoList_.add(stmt);
-			else if(stmt instanceof IASTLabelStatement)
-				labelList_.add(stmt);
-			return PROCESS_CONTINUE;
-		}
-		
-		public LinkedList getGotoList(){return gotoList_;}
-		public LinkedList getLabelList() {return labelList_;}
-	}
-	
-	class OffsetCalculator extends ASTVisitor{
-		private ICallGraphNode node_;
-		private IASTGotoStatement gotoS_;
-		private IASTLabelStatement labelS_;
-		private int gotoMet;
-		private int labelMet;
-		private int count;
-		
-		public OffsetCalculator(ICallGraphNode node, IASTGotoStatement gotoS, IASTLabelStatement label){
-			node_ = node;
-			gotoS_ = gotoS;
-			labelS_ = label;
-			gotoMet = -1;
-			labelMet = -1;
-			count = 0;
-		}
-		
-		public boolean gotoBFlabel(){
-			this.shouldVisitStatements = true;
-			IASTStatement body = node_.getFuncDef().getBody();
-			body.accept(this);
-			if(gotoMet == -1 || labelMet == -1){
-				System.out.println("Goto or label not found!"); //$NON-NLS-1$
-			} else if(gotoMet > 1 || labelMet > 1){
-				System.out.println("Multiple gotos and labels are met!"); //$NON-NLS-1$
-			}
-			return gotoMet < labelMet;
-		}
-		
-		public int visit(IASTStatement stmt){
-			if(stmt instanceof IASTGotoStatement && stmt == gotoS_){
-				gotoMet = count;
-				count ++;
-			} else if (stmt instanceof IASTLabelStatement && stmt == labelS_){
-				labelMet = count;
-				count ++;
-			}
-			return PROCESS_CONTINUE;
-		}
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIBarrierAnalysisResults.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIBarrierAnalysisResults.java
deleted file mode 100644
index e5522ae..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIBarrierAnalysisResults.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis.analysis;
-
-public class MPIBarrierAnalysisResults {
-	protected BarrierTable barrierTable_ = null;
-	
-	protected static MPIBarrierAnalysisResults results_ = null;
-	
-	public MPIBarrierAnalysisResults(){
-		results_ = this;
-	}
-	
-	public static MPIBarrierAnalysisResults getAnalysisResults(){
-		return results_;
-	}
-	
-	public void setBarrierTable(BarrierTable table){
-		barrierTable_ = table;
-	}
-	
-	public BarrierTable getBarrierTable(){
-		return barrierTable_;
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIBarrierExpr.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIBarrierExpr.java
deleted file mode 100644
index 2e7e387..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIBarrierExpr.java
+++ /dev/null

@@ -1,814 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,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.analysis.analysis;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Stack;
-
-import org.eclipse.cdt.core.dom.ast.*;
-import org.eclipse.cdt.internal.core.dom.parser.IASTAmbiguousExpression;
-import org.eclipse.cdt.internal.core.dom.parser.IASTAmbiguousStatement;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.BarrierExpression.BarrierExpressionOP;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraph;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraphNode;
-
-/**
- * MPIBarrierExpr is an ASTVisitor
- * @author beth
- *
- */
-public class MPIBarrierExpr extends ASTVisitor {
-	protected BarrierTable bTable_;
-	protected ICallGraph cg_;
-	/** One stack for each communicator */
-	protected Hashtable<String,Stack<BarrierExpression>> stacks_; 
-	
-	protected MPICallGraphNode currentNode_;
-	private static final boolean traceOn=false;
-	
-	/**
-	 * switch statement may be nested 
-	 */
-	protected int depth = 0;
-	
-	/**
-	 * This field is used to recognize the associated case body. The idea is 
-	 * the case body should have the same parent with the "case" statement. 
-	 * One element in this stack is shared by all cases (and default) in one 
-	 * switch statement. This is possible because of the tree structure. 
-	 */
-	protected Stack<IASTNode> caseParent = null;
-	
-	/**
-	 * This field is used to record whether the current case has "break"
-	 * statement. Same as above, one element is shared by all cases and default 
-	 * in a switch statement.
-	 */
-	protected Stack<Boolean> withBreak = null;
-	
-	/**
-	 *  Each bucket in this hashtable is a List, hashed by communicator.
-	 * The List records the current barrier 
-	 * expression for each case statement in the current (nested)switch statement.
-	 * So: Hashtable(for each communicator) -->
-	 *     Stack(for each nested switch statement) -->
-	 *     ArrayList(for each case body) --> 
-	 *     Tuple(caseStatement, CaseBarrierExpr) 
-	 */
-	protected Hashtable<String,Stack<List>> caseBE = null;
-	
-	public MPIBarrierExpr(BarrierTable btable, ICallGraph cg){
-		bTable_ = btable;
-		cg_ = cg;
-	}
-	
-	private void init(){
-		stacks_ = new Hashtable<String,Stack<BarrierExpression>>();
-		for(Enumeration<String> e = bTable_.getTable().keys(); e.hasMoreElements();){
-			String comm = e.nextElement();
-			stacks_.put(comm, new Stack<BarrierExpression>());
-		}
-		
-		depth = 0;
-		caseParent = new Stack<IASTNode>();
-		withBreak = new Stack<Boolean>();
-		caseBE = new Hashtable<String,Stack<List>>();
-		for(Enumeration<String> e = bTable_.getTable().keys(); e.hasMoreElements();){
-			String comm = e.nextElement();
-			caseBE.put(comm, new Stack<List>());
-		}
-	}
-	
-	
-	public void run(){
-		if(bTable_.isEmpty()) return;
-		this.shouldVisitExpressions = true;
-		this.shouldVisitStatements = true;
-		this.shouldVisitDeclarations = true;
-		for(ICallGraphNode n = cg_.botEntry(); n != null; n = n.botNext()){
-			currentNode_ = (MPICallGraphNode)n;
-			if(!currentNode_.marked) continue;
-			if(!currentNode_.barrierRelated()) continue;
-			//System.out.println("Barrier related function " + currentNode_.getFuncName());
-			init();
-			IASTFunctionDefinition func = currentNode_.getFuncDef();
-			func.accept(this);
-			for(Enumeration<String> e = stacks_.keys(); e.hasMoreElements();){
-				String comm = e.nextElement();
-				Stack<BarrierExpression> sk = stacks_.get(comm);
-				BarrierExpression be = sk.pop();
-				if(traceOn)System.out.println(currentNode_.getFuncName() + "(" + comm + "): " + be.prettyPrinter()); //$NON-NLS-1$ //$NON-NLS-2$
-				if(traceOn)System.out.println(" "); //$NON-NLS-1$
-				currentNode_.setBarrierExpr(comm, be);
-			}
-		}
-		/*
-		if(traceOn)System.out.println("Total number of repeat subtrees: " + BarrierExpression.count_repeat);
-		if(traceOn)System.out.println("Total number of branch subtrees: " + BarrierExpression.count_branch);
-		*/
-		if(traceOn)System.out.println("Total number of nodes: " + BarrierExpression.count_node); //$NON-NLS-1$
-		/*
-		BarrierExpression.count_branch = 0;
-		BarrierExpression.count_repeat = 0;
-		*/
-	}
-	
-	public int visit(IASTStatement stmt){
-		if(stmt instanceof IASTSwitchStatement){
-			for(Enumeration<Stack<List>> e = caseBE.elements(); e.hasMoreElements();){
-				Stack<List> caseBEsk = e.nextElement();
-				caseBEsk.push(new ArrayList<Object>());
-			}
-			withBreak.push(new Boolean(false));
-			depth ++;
-		}
-		return PROCESS_CONTINUE;
-	}
-	
-	public int leave(IASTStatement stmt){
-		BarrierExpression be = null;
-		BarrierExpression operand1 = null;
-		BarrierExpression operand2 = null;
-		BarrierExpression condBE = null;
-		
-		if(stmt instanceof IASTAmbiguousStatement){
-			
-		}
-		else if(stmt instanceof IASTBreakStatement){
-			IASTBreakStatement bkStmt = (IASTBreakStatement)stmt;
-			if(inCaseStmt(bkStmt)){
-				for(Enumeration<String> e = caseBE.keys(); e.hasMoreElements();){
-					String comm = e.nextElement();
-					Stack<List> caseBEsk = caseBE.get(comm);
-					Stack<BarrierExpression> sk = stacks_.get(comm);
-					be = new BarrierExpression(BarrierExpression.BE_bot);
-					sk.push(be);
-					List list = caseBEsk.peek();
-					for(int i=1; i<list.size(); i+=2){
-						CaseBarrierExpr cbe = (CaseBarrierExpr)list.get(i);
-						cbe.close();
-					}
-				}
-			}
-			else{
-				for(Enumeration<String> e = caseBE.keys(); e.hasMoreElements();){
-					String comm = e.nextElement();
-					Stack<BarrierExpression> sk = stacks_.get(comm);
-					be = new BarrierExpression(BarrierExpression.BE_bot);
-					sk.push(be);
-				}
-			}
-		}
-		else if(stmt instanceof IASTCaseStatement){
-			IASTCaseStatement caseStmt = (IASTCaseStatement)stmt;
-			/* Override the old parent if it exists */
-			if(!caseParent.empty()) caseParent.pop();
-			caseParent.push(caseStmt.getParent());
-			
-			for(Enumeration e = caseBE.keys(); e.hasMoreElements();){
-				String comm = (String)e.nextElement();
-				Stack<List> caseBEsk = caseBE.get(comm);
-				Stack<BarrierExpression> sk = stacks_.get(comm);
-				be = new BarrierExpression(BarrierExpression.BE_bot);
-				sk.push(be);
-				List list = caseBEsk.peek();
-				list.add(caseStmt);
-				list.add(new CaseBarrierExpr(be, caseStmt.getExpression()));
-			}
-			
-			/* Toggle the withBreak sign of the previous case */
-			if(!withBreak.empty()) withBreak.pop();
-			withBreak.push(new Boolean(false));
-		}
-		else if(stmt instanceof IASTCompoundStatement){
-			IASTCompoundStatement cmpStmt = (IASTCompoundStatement)stmt;
-			IASTStatement [] s = cmpStmt.getStatements();
-			if(s.length == 0) return PROCESS_CONTINUE;
-
-			for(Enumeration<String> e = stacks_.keys(); e.hasMoreElements();){
-				String comm = e.nextElement();
-				Stack<BarrierExpression> sk = stacks_.get(comm);
-				/* The concatenate operator is left-associative */
-				int count = 0;
-				int i;
-				BarrierExpression[] BElist = new BarrierExpression[s.length];
-				for(i=0; i<s.length; i++){
-					if(s[i] == null) continue;
-					BElist[count] = sk.pop();
-					count ++;
-				}
-				operand1 = BElist[count-1];
-				for (i = count-2; i >= 0; i-- ) {
-					operand2 = BElist[i];
-					be = BarrierExpression.concatBE(operand1, operand2);
-					operand1 = be;
-				}
-				sk.push(operand1);
-				fixSwitch(comm, cmpStmt, operand1);
-			}
-		}
-		else if(stmt instanceof IASTContinueStatement){
-			for(Enumeration<String> e = caseBE.keys(); e.hasMoreElements();){
-				String comm = e.nextElement();
-				Stack<BarrierExpression> sk = stacks_.get(comm);
-				be = new BarrierExpression(BarrierExpression.BE_bot);
-				sk.push(be);
-			}
-		}
-		else if(stmt instanceof IASTDeclarationStatement){
-			boolean initialized = false;
-			IASTDeclarationStatement declStmt = (IASTDeclarationStatement)stmt;
-			IASTDeclaration decl = declStmt.getDeclaration();
-			if(decl instanceof IASTSimpleDeclaration){
-				IASTSimpleDeclaration simpleDecl = (IASTSimpleDeclaration)decl;
-				IASTDeclarator[] declarators = simpleDecl.getDeclarators();
-				for(int i=0; i<declarators.length; i++){
-					IASTInitializer init = declarators[i].getInitializer();
-					if(init != null){
-						initialized = true;
-						for(Enumeration<String> e = stacks_.keys(); e.hasMoreElements();){
-							String comm = e.nextElement();
-							Stack<BarrierExpression> sk = stacks_.get(comm);
-							be = getInitializerBE(sk, init);
-							sk.push(be);
-						}
-					}
-				}
-			}
-			if(!initialized){
-				for(Enumeration<String> e = stacks_.keys(); e.hasMoreElements();){
-					String comm = e.nextElement();
-					Stack<BarrierExpression> sk = stacks_.get(comm);
-					be = new BarrierExpression(BarrierExpression.BE_bot);
-					sk.push(be);
-				}
-			}
-		}
-		else if(stmt instanceof IASTDefaultStatement){
-			/* DefaultStatement = CaseStatement + BreakStatement */
-			IASTDefaultStatement dfStmt = (IASTDefaultStatement)stmt;
-			/* Override the old parent if it exists */
-			if(!caseParent.empty()) caseParent.pop();
-			caseParent.push(dfStmt.getParent());
-			
-			for(Enumeration<String> e = caseBE.keys(); e.hasMoreElements();){
-				String comm = e.nextElement();
-				Stack<List> caseBEsk = caseBE.get(comm);
-				Stack<BarrierExpression> sk = stacks_.get(comm);
-				be = new BarrierExpression(BarrierExpression.BE_bot);
-				List list = caseBEsk.peek();
-				list.add(dfStmt);
-				list.add(new CaseBarrierExpr(be, null));
-			}
-		}
-		else if(stmt instanceof IASTDoStatement){
-			IASTDoStatement doStmt = (IASTDoStatement)stmt;
-			for(Enumeration<String> e = stacks_.keys(); e.hasMoreElements();){
-				String comm = e.nextElement();
-				Stack<BarrierExpression> sk = stacks_.get(comm);
-				/* condition */
-				if(doStmt.getCondition() != null)
-					condBE = (BarrierExpression)sk.pop();
-				else
-					condBE = new BarrierExpression(BarrierExpression.BE_bot);
-				/* loop body */
-				if(doStmt.getBody() != null)
-					operand1 = (BarrierExpression)sk.pop();
-				else
-					operand1 = new BarrierExpression(BarrierExpression.BE_bot);
-				/* BE = body . cond. (body . cond)* */
-				be = BarrierExpression.concatBE(operand1, condBE, 
-						BarrierExpression.repeatBE(
-							BarrierExpression.concatBE(operand1, condBE), 
-								doStmt.getCondition(), stmt));
-				sk.push(be);
-				fixSwitch(comm, stmt, be);
-			}
-		}
-		else if(stmt instanceof IASTExpressionStatement){
-			for(Enumeration<String> e = stacks_.keys(); e.hasMoreElements();){
-				String comm = e.nextElement();
-				Stack<BarrierExpression> sk = stacks_.get(comm);
-				be = sk.pop();
-				sk.push(be);
-				fixSwitch(comm, stmt, be);
-			}
-		}
-		else if(stmt instanceof IASTForStatement){
-			IASTForStatement forStmt = (IASTForStatement)stmt;
-			BarrierExpression initBE = null;
-			BarrierExpression iterBE = null;
-			for(Enumeration<String> e = stacks_.keys(); e.hasMoreElements();){
-				String comm = e.nextElement();
-				Stack<BarrierExpression> sk = stacks_.get(comm);
-				/* loop body */
-				if(forStmt.getBody() != null)
-					operand1 = sk.pop();
-				else
-					operand1 = new BarrierExpression(BarrierExpression.BE_bot);
-				/* iterator */
-				if(forStmt.getIterationExpression() != null)
-					iterBE = sk.pop();
-				else
-					iterBE = new BarrierExpression(BarrierExpression.BE_bot);
-				/* condition */
-				if(forStmt.getConditionExpression() != null)
-					condBE = sk.pop();
-				else
-					condBE = new BarrierExpression(BarrierExpression.BE_bot);
-				/* initializer */
-				if(forStmt.getInitializerStatement() != null)
-					initBE = sk.pop();
-				else
-					initBE = new BarrierExpression(BarrierExpression.BE_bot);
-				/* BE = init . cond. (body . iter . cond)* */
-				be = BarrierExpression.concatBE(initBE, condBE, 
-						BarrierExpression.repeatBE(
-							BarrierExpression.concatBE(operand1, iterBE, condBE), 
-							forStmt.getConditionExpression(), stmt));
-				sk.push(be);
-				fixSwitch(comm, stmt, be);
-			}
-		} 
-		else if(stmt instanceof IASTGotoStatement){
-			/* TODO */
-		}
-		else if(stmt instanceof IASTIfStatement){
-			IASTIfStatement ifStmt = (IASTIfStatement)stmt;
-			for(Enumeration<String> e = stacks_.keys(); e.hasMoreElements();){
-				String comm = e.nextElement();
-				Stack<BarrierExpression> sk = stacks_.get(comm);
-				/* else clause */
-				if(ifStmt.getElseClause() != null)
-					operand2 = sk.pop();
-				else 
-					operand2 = new BarrierExpression(BarrierExpression.BE_bot);
-				/* then clause */
-				if(ifStmt.getThenClause() != null)
-					operand1 = sk.pop();
-				else
-					operand1 = new BarrierExpression(BarrierExpression.BE_bot);
-				/* condition*/
-				if(ifStmt.getConditionExpression() != null)
-					condBE = sk.pop();
-				else
-					condBE = new BarrierExpression(BarrierExpression.BE_bot);
-				/* BE = cond. (then | else) */
-				be = BarrierExpression.concatBE(condBE, 
-						BarrierExpression.branchBE(operand1, operand2, 
-							ifStmt.getConditionExpression(), stmt));
-				sk.push(be); 		
-				fixSwitch(comm, stmt, be);
-			}
-		}
-		else if(stmt instanceof IASTLabelStatement){
-			/* TODO */
-		}
-		else if(stmt instanceof IASTNullStatement){
-			for(Enumeration<Stack<BarrierExpression>> e = stacks_.elements(); e.hasMoreElements();){
-				Stack<BarrierExpression> sk = e.nextElement();
-				be = new BarrierExpression(BarrierExpression.BE_bot);
-				sk.push(be);
-			}
-		}
-		else if(stmt instanceof IASTProblemStatement){
-			for(Enumeration<Stack<BarrierExpression>> e = stacks_.elements(); e.hasMoreElements();){
-				Stack<BarrierExpression> sk = e.nextElement();
-				be = new BarrierExpression(BarrierExpression.BE_bot);
-				sk.push(be);
-			}
-		}
-		else if(stmt instanceof IASTReturnStatement){
-			IASTReturnStatement rStmt = (IASTReturnStatement)stmt;
-			if(rStmt.getReturnValue() == null){
-				for(Enumeration<Stack<BarrierExpression>> e = stacks_.elements(); e.hasMoreElements();){
-					Stack<BarrierExpression> sk = e.nextElement();
-					be = new BarrierExpression(BarrierExpression.BE_bot);
-					sk.push(be);
-				}
-			} else {
-				for(Enumeration<String> e = caseBE.keys(); e.hasMoreElements();){
-					String comm = e.nextElement();
-					Stack<BarrierExpression> sk = stacks_.get(comm);
-					be = sk.pop();
-					sk.push(be);
-					if(!withBreak.empty()){
-						withBreak.pop();
-						withBreak.push(new Boolean(true));
-					}
-					fixSwitch(comm, rStmt, be);
-				}
-			}
-		}
-		else if(stmt instanceof IASTSwitchStatement){
-			IASTSwitchStatement swStmt = (IASTSwitchStatement)stmt;
-			for(Enumeration<String> e = caseBE.keys(); e.hasMoreElements();){
-				String comm = e.nextElement();
-				Stack<List> caseBEsk = caseBE.get(comm);
-				List list = caseBEsk.pop();
-				CaseBarrierExpr cbe = (CaseBarrierExpr)list.get(1);
-				operand1 = (BarrierExpression)cbe.getBE();
-				for(int i=3; i<list.size(); i+=2){
-					cbe = (CaseBarrierExpr)list.get(i);
-					operand2 = (BarrierExpression)cbe.getBE();
-					be = BarrierExpression.branchBE(operand1, operand2, 
-							swStmt.getControllerExpression(), stmt);
-					operand1 = be;
-				}
-				Stack<BarrierExpression> sk = stacks_.get(comm);
-				sk.pop();
-				sk.push(operand1);
-			}
-			withBreak.pop();
-			caseParent.pop();
-			depth --;
-		}
-		else if(stmt instanceof IASTWhileStatement){
-			IASTWhileStatement whStmt = (IASTWhileStatement)stmt;
-			for(Enumeration<String> e = stacks_.keys(); e.hasMoreElements();){
-				String comm = e.nextElement();
-				Stack<BarrierExpression> sk = stacks_.get(comm);
-				/* loop body */
-				if(whStmt.getBody() != null)
-					operand1 = sk.pop();
-				else
-					operand1 = new BarrierExpression(BarrierExpression.BE_bot);
-				/* condition */
-				if(whStmt.getCondition() != null) 
-					condBE = sk.pop();
-				else
-					condBE = new BarrierExpression(BarrierExpression.BE_bot);
-				/* BE = cond . (body . cond)*  */
-				be = BarrierExpression.concatBE(condBE, 
-						BarrierExpression.repeatBE(
-							BarrierExpression.concatBE(operand1, condBE), 
-								whStmt.getCondition(), stmt));
-				sk.push(be);
-				fixSwitch(comm, stmt, be);
-			}
-		}
-
-		return PROCESS_CONTINUE;
-	}
-	
-	/** 
-	 * If the current statement is a case body
-	 */
-	private void fixSwitch(String key, IASTStatement stmt, BarrierExpression BE){
-		if(depth <= 0) return;
-		if(stmt.getParent() == caseParent.peek()){
-			Stack<List> caseBEsk = caseBE.get(key);
-			List list = caseBEsk.peek();
-			boolean flag = ((Boolean)withBreak.peek()).booleanValue();
-			for(int i = 1; i<list.size(); i+=2){
-				CaseBarrierExpr cbe = (CaseBarrierExpr)list.get(i);
-				if(flag)
-					cbe.addFinalBEElement(BE);
-				else 
-					cbe.addBEElement(BE);
-			}
-		}
-	}
-	
-	private boolean inCaseStmt(IASTBreakStatement stmt){
-		IASTNode parent = stmt.getParent();
-		while(parent != null){
-			if(parent instanceof IASTForStatement ||
-			   parent instanceof IASTDoStatement ||
-			   parent instanceof IASTWhileStatement)
-				return false;
-			else if(parent instanceof IASTSwitchStatement)
-				return true;
-			else if(parent instanceof IASTFunctionDefinition)
-				return false;
-			else
-				parent = parent.getParent();
-		}
-		return false;
-	}
-	
-	private BarrierExpression getInitializerBE(Stack sk, IASTInitializer init){		
-		BarrierExpression BE = null;
-		if(init instanceof IASTEqualsInitializer){

-			BE = (BarrierExpression)sk.pop();
-		}
-		else if(init instanceof IASTInitializerList){// BRT  !will this be encountered? 
-			IASTInitializerList list = (IASTInitializerList)init;
-			IASTInitializer[] inits = list.getInitializers();
-			for(int j = 0; j<inits.length; j++){
-				if(BE == null)
-					BE = getInitializerBE(sk, inits[j]);
-				else
-					BE = BarrierExpression.concatBE(BE, 
-							getInitializerBE(sk, inits[j]));
-			}
-		}
-		return BE;
-	}
-	
-	/**
-	 * An expression which doesn't have any "expression" 
-	 * field is a terminal. 
-	 */
-	public int leave(IASTExpression expr){
-		BarrierExpression be = null;
-		BarrierExpression operand1 = null;
-		BarrierExpression operand2 = null;
-		BarrierExpression operand3 = null;
-		
-		if(expr instanceof IASTAmbiguousExpression){
-			/* nothing */
-		}
-		else if(expr instanceof IASTArraySubscriptExpression){
-			for(Enumeration<Stack<BarrierExpression>> e = stacks_.elements(); e.hasMoreElements();){
-				Stack<BarrierExpression> sk = e.nextElement();
-				operand2 = sk.pop();  //subscript
-				operand1 = sk.pop();  //array
-				be = BarrierExpression.concatBE(operand1, operand2);
-				sk.push(be);
-			}
-		}
-		else if(expr instanceof IASTBinaryExpression){
-			for(Enumeration<Stack<BarrierExpression>> e = stacks_.elements(); e.hasMoreElements();){
-				Stack<BarrierExpression> sk = e.nextElement();
-				operand2 = sk.pop();
-				operand1 = sk.pop();
-				be = BarrierExpression.concatBE(operand1, operand2);
-				sk.push(be);
-			}
-		}
-		else if(expr instanceof IASTCastExpression){
-			/* Has only one operator, leave it there */
-		}
-		else if(expr instanceof IASTConditionalExpression){
-			IASTConditionalExpression cExpr = (IASTConditionalExpression)expr;
-			IASTNode parent = expr.getParent();
-			while(! (parent instanceof IASTStatement) )
-				parent = parent.getParent();
-			for(Enumeration<Stack<BarrierExpression>> e = stacks_.elements(); e.hasMoreElements();){
-				Stack<BarrierExpression> sk = e.nextElement();
-				operand2 = sk.pop(); /* negative */
-				operand1 = sk.pop(); /* positive */
-				operand3 = sk.pop(); /* condition */
-				/* E = C ( P | N ) */
-				be = BarrierExpression.concatBE(operand3, 
-						BarrierExpression.branchBE(operand1, operand2, 
-								cExpr.getLogicalConditionExpression(), 
-								(IASTStatement)parent));
-				sk.push(be);
-			}
-		}
-		else if(expr instanceof IASTExpressionList){// BRT !this will not get executed!!  should it be hit ONLY for fn arg exprList? or not? can we do this elsewhere e.g. functionCallExpr?
-			IASTExpressionList exprList = (IASTExpressionList)expr;
-			IASTExpression[] exps = exprList.getExpressions();
-			if(exps.length == 0) return PROCESS_CONTINUE;
-			for(Enumeration<Stack<BarrierExpression>> e = stacks_.elements(); e.hasMoreElements();){
-				Stack<BarrierExpression> sk = e.nextElement();
-				int count = 0;
-				int i;
-				BarrierExpression[] BElist = new BarrierExpression[exps.length];
-				for(i=0; i<exps.length; i++){
-					if(exps[i] == null) continue;
-					BElist[count] = sk.pop();
-					count ++;
-				}
-				operand1 = BElist[count-1];
-				for (i = count-2; i >= 0; i-- ) {
-					operand2 = BElist[i];
-					be = BarrierExpression.concatBE(operand1, operand2);
-					operand1 = be;
-				}
-				sk.push(operand1);
-			}
-		}
-		else if(expr instanceof IASTFieldReference){
-			/*
-			for(Enumeration e = stacks_.elements(); e.hasMoreElements();){
-				Stack sk = (Stack)e.nextElement();
-				operand2 = (BarrierExpression)sk.pop(); //name
-				operand1 = (BarrierExpression)sk.pop(); //owner
-				be = BarrierExpression.concatBE(operand1, operand2);
-				sk.push(be);
-			}
-			*/
-		}
-		else if(expr instanceof IASTFunctionCallExpression){
-			IASTFunctionCallExpression fExpr = (IASTFunctionCallExpression)expr;
-			IASTExpression funcname = fExpr.getFunctionNameExpression();
-			// IASTExpression parameter = fExpr.getParameterExpression(); // old 6.0 AST
-			IASTInitializerClause[] arguments = fExpr.getArguments();  
-			String signature = funcname.getRawSignature();
-			int id = bTable_.isBarrier(fExpr);
-			if(id != -1){ /* barrier */
-				be = new BarrierExpression(id);
-				String comm = bTable_.getComm(id);
-				for(Enumeration<String> e = stacks_.keys(); e.hasMoreElements();){
-					String commkey = e.nextElement();
-					// get the BarrierExpressions for this communicator
-					Stack<BarrierExpression> sk = stacks_.get(commkey);
-					// if(parameter != null) sk.pop(); //parameter  // old 6.0 AST
-					for(int i = 0; i<arguments.length; i ++) 
-					{
-						sk.pop();
-					} 
-					sk.pop(); //functionName 
-					if(commkey.equals(comm)) sk.push(be);
-					else sk.push(new BarrierExpression(BarrierExpression.BE_bot));
-				}
-			}
-			else{
-				MPICallGraphNode node = (MPICallGraphNode)cg_.getNode(currentNode_.getFileName(), signature);
-				if(node != null && node.barrierRelated()){ 
-					/* a function (directly or indirectly) with barriers */
-					for(Enumeration<String> e = stacks_.keys(); e.hasMoreElements();){
-						String comm = e.nextElement();
-						Stack<BarrierExpression> sk = stacks_.get(comm);
-						BarrierExpression funcBE = node.getBarrierExpr().get(comm);
-						// if(parameter != null) sk.pop(); //parameter // old 6.0 AST
-						for(int i = 0; i<arguments.length; i ++) 
-						{
-							sk.pop(); 
-						}
-						sk.pop(); //functionName 
-						if(node == currentNode_){ //recursive functions
-							be = new BarrierExpression(node.getFuncName());
-						}
-						else if(funcBE.isBot()){
-							be = new BarrierExpression(BarrierExpression.BE_bot);
-						} 
-						else{
-							be = new BarrierExpression(signature);
-						}
-						sk.push(be);
-					}
-				} else { //not a barrier related function
-					be = new BarrierExpression(BarrierExpression.BE_bot);
-					for(Enumeration<Stack<BarrierExpression>> e = stacks_.elements(); e.hasMoreElements();){
-						Stack<BarrierExpression> sk = e.nextElement();
-						// if(parameter != null) sk.pop(); //parameter // old 6.0 AST
-						for(int i = 0; i<arguments.length; i ++) 
-						{
-							sk.pop();
-						} 
-						sk.pop(); //functionName  
-						sk.push(be);
-					}
-				}
-			}
-		} // end IASTFunctionCallExpression
-		else if(expr instanceof IASTIdExpression){ //terminal
-			//System.out.println(((IASTIdExpression)expr).getName().toString());
-			for(Enumeration<Stack<BarrierExpression>> e = stacks_.elements(); e.hasMoreElements();){
-				Stack<BarrierExpression> sk = e.nextElement();
-				be = new BarrierExpression(BarrierExpression.BE_bot);
-				sk.push(be);
-			}
-		}
-		else if(expr instanceof IASTLiteralExpression){ //terminal
-			//System.out.println(((IASTLiteralExpression)expr).toString());
-			for(Enumeration<Stack<BarrierExpression>> e = stacks_.elements(); e.hasMoreElements();){
-				Stack<BarrierExpression> sk = e.nextElement();
-				be = new BarrierExpression(BarrierExpression.BE_bot);
-				sk.push(be);
-			}
-		}
-		/*
-		else if(expr instanceof IASTProblemExpression){
-			System.out.println("IASTProblemExpression");
-		}
-		*/
-		else if(expr instanceof IASTTypeIdExpression){
-			for(Enumeration<Stack<BarrierExpression>> e = stacks_.elements(); e.hasMoreElements();){
-				Stack<BarrierExpression> sk = e.nextElement();
-				be = new BarrierExpression(BarrierExpression.BE_bot);
-				sk.push(be);
-			}
-		}
-		else if(expr instanceof IASTUnaryExpression){
-			/* has only one operand, leave it there */
-		}
-		/*
-		else if(expr instanceof ICASTTypeIdInitializerExpression){
-			System.out.println("ICASTTypeIdInitializerExpression");
-		}
-		*/
-		return PROCESS_CONTINUE;
-	} // end leave()
-
-	class CaseBarrierExpr{
-		protected BarrierExpression BE;
-		protected boolean closed;
-		protected IASTExpression cond;
-		
-		CaseBarrierExpr(BarrierExpression be, IASTExpression cond){
-			BE = be;
-			closed = false;
-			this.cond = cond;
-		}
-		
-		public void close() { closed = true; }
-		public BarrierExpression getBE() {return BE;}
-		public IASTExpression getCond() {return cond;}
-
-		public void addBEElement(BarrierExpression be){
-			if(closed) return;
-			if(BE == null){
-				BE = be;
-			} else {
-				BE = BarrierExpression.concatBE(BE, be);
-			}
-		}
-		
-		public void addFinalBEElement(BarrierExpression be){
-			addBEElement(be);
-			close();
-		}
-	}
-	
-	protected void checkBarrierRecursion(){
-		for(Iterator<List<ICallGraphNode>> i=cg_.getCycles().iterator(); i.hasNext();){
-			List<ICallGraphNode> cycle = i.next();
-			boolean barrierRelated = false;
-			for(Iterator<ICallGraphNode> ii = cycle.iterator(); ii.hasNext();){
-				MPICallGraphNode node = (MPICallGraphNode)ii.next();
-				if(node.barrierRelated){
-					barrierRelated = true;
-					break;
-				}
-			}
-			if(!barrierRelated) continue;
-			if(cycle.size() > 1){
-				System.out.println("Multi-Function barrier related cycles"); //$NON-NLS-1$
-				return;
-			}
-			currentNode_ = (MPICallGraphNode)cycle.get(0);
-			for(Enumeration<String> e = currentNode_.getBarrierExpr().keys(); e.hasMoreElements();){
-				String comm = e.nextElement();
-				BarrierExpression BE = currentNode_.getBarrierExpr().get(comm);
-				if(recursion(BE) == recursionError){
-					System.out.println("Recursion Error in " + comm); //$NON-NLS-1$
-				}
-			}
-			
-		}
-	}
-	
-	protected final int recursionCorrect = 0;
-	protected final int recursionError = 1;
-	protected final int noRecursion = 2;
-	
-	protected int recursion(BarrierExpression BE){
-		if(traceOn)System.out.println(BE.prettyPrinter());
-		BarrierExpressionOP OP = BE.getOP();
-		if(OP == null){
-			if(BE.isFunc()){ //function call
-				String funcName = BE.getFuncName();
-				MPICallGraphNode fnode = (MPICallGraphNode)cg_.getNode(currentNode_.getFileName(), funcName);
-				if(fnode == currentNode_)
-					return recursionCorrect;
-				else 
-					return noRecursion;
-			}
-			else
-				return noRecursion;
-		}
-		else if(OP.getOperator() == BarrierExpressionOP.op_concat){
-			int v1 = recursion(BE.getOP1());
-			int v2 = recursion(BE.getOP2());
-			if(v1 == recursionError || v2 == recursionError)
-				return recursionError;
-			else if(v1 == recursionCorrect || v2 == recursionCorrect)
-				return recursionCorrect;
-			else 
-				return noRecursion;
-
-		}
-		else if(OP.getOperator() == BarrierExpressionOP.op_branch){
-			int v1 = recursion(BE.getOP1());
-			int v2 = recursion(BE.getOP2());
-			if(v1 == noRecursion && v2 == noRecursion)
-				return noRecursion;
-			else
-				return recursionError;
-		}
-		else { //BarrierExpressionOP.op_repeat
-			return recursion(BE.getOP1());
-
-		}
-	}
-
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIBarrierExprModified.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIBarrierExprModified.java
deleted file mode 100644
index 2caf045..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIBarrierExprModified.java
+++ /dev/null

@@ -1,826 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis.analysis;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Stack;
-
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTArraySubscriptExpression;
-import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression;
-import org.eclipse.cdt.core.dom.ast.IASTBreakStatement;
-import org.eclipse.cdt.core.dom.ast.IASTCaseStatement;
-import org.eclipse.cdt.core.dom.ast.IASTCastExpression;
-import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement;
-import org.eclipse.cdt.core.dom.ast.IASTConditionalExpression;
-import org.eclipse.cdt.core.dom.ast.IASTContinueStatement;
-import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTDeclarationStatement;
-import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
-import org.eclipse.cdt.core.dom.ast.IASTDefaultStatement;
-import org.eclipse.cdt.core.dom.ast.IASTDoStatement;
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTExpressionList;
-import org.eclipse.cdt.core.dom.ast.IASTExpressionStatement;
-import org.eclipse.cdt.core.dom.ast.IASTFieldReference;
-import org.eclipse.cdt.core.dom.ast.IASTForStatement;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionCallExpression;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
-import org.eclipse.cdt.core.dom.ast.IASTGotoStatement;
-import org.eclipse.cdt.core.dom.ast.IASTIdExpression;
-import org.eclipse.cdt.core.dom.ast.IASTIfStatement;
-import org.eclipse.cdt.core.dom.ast.IASTInitializer;
-import org.eclipse.cdt.core.dom.ast.IASTInitializerExpression;
-import org.eclipse.cdt.core.dom.ast.IASTInitializerList;
-import org.eclipse.cdt.core.dom.ast.IASTLabelStatement;
-import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTNullStatement;
-import org.eclipse.cdt.core.dom.ast.IASTProblemStatement;
-import org.eclipse.cdt.core.dom.ast.IASTReturnStatement;
-import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.cdt.core.dom.ast.IASTSwitchStatement;
-import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression;
-import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
-import org.eclipse.cdt.core.dom.ast.IASTWhileStatement;
-import org.eclipse.cdt.internal.core.dom.parser.IASTAmbiguousExpression;
-import org.eclipse.cdt.internal.core.dom.parser.IASTAmbiguousStatement;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.BarrierExpression.BarrierExpressionOP;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraph;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraphNode;
-
-public class MPIBarrierExprModified extends ASTVisitor {
-	protected BarrierTable bTable_;
-	protected ICallGraph cg_;
-	/** One stack for each communicator */
-	protected Hashtable<String,Stack<BarrierExpression>> stacks_; 
-	private static final boolean traceOn=false;
-	
-	protected MPICallGraphNode currentNode_;
-	
-	/** 
-	 * switch statement may be nested 
-	 */
-	protected int depth = 0;
-	
-	/** 
-	 * This field is used to recognize the associated case body. The idea is 
-	 * the case body should have the same parent with the "case" statement. 
-	 * One element in this stack is shared by all cases (and default) in one 
-	 * switch statement. This is possible because of the tree structure. 
-	 */
-	protected Stack<IASTNode> caseParent = null;
-	
-	/** 
-	 * This field is used to record whether the current case has "break"
-	 * statement. Same as above, one element is shared by all cases and default 
-	 * in a switch statement.
-	 */
-	protected Stack<Boolean> withBreak = null;
-	
-	/**
-	 *  Each bucket in this hashtable is a List, hashed by communicator.
-	 * The List records the current barrier 
-	 * expression for each case statement in the current (nested)switch statement.
-	 * So: Hashtable(for each communicator) -->
-	 *     Stack(for each nested switch statement) -->
-	 *     ArrayList(for each case body) --> 
-	 *     Tuple(caseStatement, CaseBarrierExpr) 
-	 */
-	protected Hashtable<String,Stack<List>> caseBE = null;
-	
-	public MPIBarrierExprModified(BarrierTable btable, ICallGraph cg){
-		bTable_ = btable;
-		cg_ = cg;
-	}
-	
-	private void init(){
-		stacks_ = new Hashtable<String,Stack<BarrierExpression>>();
-		for(Enumeration<String> e = bTable_.getTable().keys(); e.hasMoreElements();){
-			String comm = e.nextElement();
-			stacks_.put(comm, new Stack<BarrierExpression>());
-		}
-		
-		depth = 0;
-		caseParent = new Stack<IASTNode>();
-		withBreak = new Stack<Boolean>();
-		caseBE = new Hashtable<String,Stack<List>>();
-		for(Enumeration<String> e = bTable_.getTable().keys(); e.hasMoreElements();){
-			String comm = e.nextElement();
-			caseBE.put(comm, new Stack<List>());
-		}
-	}
-	
-	
-	public void run(){
-		if(bTable_.isEmpty()) return;
-		this.shouldVisitExpressions = true;
-		this.shouldVisitStatements = true;
-		this.shouldVisitDeclarations = true;
-		for(ICallGraphNode n = cg_.botEntry(); n != null; n = n.botNext()){
-			currentNode_ = (MPICallGraphNode)n;
-			if(!currentNode_.marked) continue;
-			if(!currentNode_.barrierRelated()) continue;
-			//System.out.println("Barrier related function " + currentNode_.getFuncName());
-			init();
-			IASTFunctionDefinition func = currentNode_.getFuncDef();
-			func.accept(this);
-			for(Enumeration<String> e = stacks_.keys(); e.hasMoreElements();){
-				String comm = e.nextElement();
-				Stack<BarrierExpression> sk = stacks_.get(comm);
-				BarrierExpression be = sk.pop();
-				if(traceOn)System.out.println(currentNode_.getFuncName() + "(" + comm + "): " + be.prettyPrinter()); //$NON-NLS-1$ //$NON-NLS-2$
-				if(traceOn)System.out.println(" "); //$NON-NLS-1$
-				currentNode_.setBarrierExpr(comm, be);
-			}
-		}
-		if(traceOn)System.out.println("Total number of nodes: " + BarrierExpression.count_node); //$NON-NLS-1$
-	}
-	
-	public int visit(IASTStatement stmt){
-		if(stmt instanceof IASTSwitchStatement){
-			for(Enumeration<Stack<List>> e = caseBE.elements(); e.hasMoreElements();){
-				Stack<List> caseBEsk = e.nextElement();
-				caseBEsk.push(new ArrayList<Object>());
-			}
-			withBreak.push(new Boolean(false));
-			depth ++;
-		}
-		return PROCESS_CONTINUE;
-	}
-	
-	public int leave(IASTStatement stmt){
-		BarrierExpression be = null;
-		BarrierExpression operand1 = null;
-		BarrierExpression operand2 = null;
-		BarrierExpression condBE = null;
-		
-		if(stmt instanceof IASTAmbiguousStatement){
-			
-		}
-		else if(stmt instanceof IASTBreakStatement){
-			IASTBreakStatement bkStmt = (IASTBreakStatement)stmt;
-			if(inCaseStmt(bkStmt)){
-				for(Enumeration<String> e = caseBE.keys(); e.hasMoreElements();){
-					String comm = e.nextElement();
-					Stack<List> caseBEsk = caseBE.get(comm);
-					Stack<BarrierExpression> sk = stacks_.get(comm);
-					be = new BarrierExpression(BarrierExpression.BE_bot);
-					sk.push(be);
-					List list = caseBEsk.peek();
-					for(int i=1; i<list.size(); i+=2){
-						CaseBarrierExpr cbe = (CaseBarrierExpr)list.get(i);
-						cbe.close();
-					}
-				}
-			}
-			else{
-				for(Enumeration<String> e = caseBE.keys(); e.hasMoreElements();){
-					String comm = e.nextElement();
-					Stack<BarrierExpression> sk = stacks_.get(comm);
-					be = new BarrierExpression(BarrierExpression.BE_bot);
-					sk.push(be);
-				}
-			}
-		}
-		else if(stmt instanceof IASTCaseStatement){
-			IASTCaseStatement caseStmt = (IASTCaseStatement)stmt;
-			/* Override the old parent if it exists */
-			if(!caseParent.empty()) caseParent.pop();
-			caseParent.push(caseStmt.getParent());
-			
-			for(Enumeration e = caseBE.keys(); e.hasMoreElements();){
-				String comm = (String)e.nextElement();
-				Stack<List> caseBEsk = caseBE.get(comm);
-				Stack<BarrierExpression> sk = stacks_.get(comm);
-				be = new BarrierExpression(BarrierExpression.BE_bot);
-				sk.push(be);
-				List list = caseBEsk.peek();
-				list.add(caseStmt);
-				list.add(new CaseBarrierExpr(be, caseStmt.getExpression()));
-			}
-			
-			/* Toggle the withBreak sign of the previous case */
-			if(!withBreak.empty()) withBreak.pop();
-			withBreak.push(new Boolean(false));
-		}
-		else if(stmt instanceof IASTCompoundStatement){
-			IASTCompoundStatement cmpStmt = (IASTCompoundStatement)stmt;
-			IASTStatement [] s = cmpStmt.getStatements();
-			if(s.length == 0) return PROCESS_CONTINUE;
-
-			for(Enumeration<String> e = stacks_.keys(); e.hasMoreElements();){
-				String comm = e.nextElement();
-				Stack<BarrierExpression> sk = stacks_.get(comm);
-				/* The concatenate operator is left-associative */
-				int count = 0;
-				int i;
-				BarrierExpression[] BElist = new BarrierExpression[s.length];
-				for(i=0; i<s.length; i++){
-					if(s[i] == null) continue;
-					BElist[count] = sk.pop();
-					count ++;
-				}
-				operand1 = BElist[count-1];
-				for (i = count-2; i >= 0; i-- ) {
-					operand2 = BElist[i];
-					be = BarrierExpression.concatBE(operand1, operand2);
-					operand1 = be;
-				}
-				sk.push(operand1);
-				fixSwitch(comm, cmpStmt, operand1);
-			}
-		}
-		else if(stmt instanceof IASTContinueStatement){
-			for(Enumeration<String> e = caseBE.keys(); e.hasMoreElements();){
-				String comm = e.nextElement();
-				Stack<BarrierExpression> sk = stacks_.get(comm);
-				be = new BarrierExpression(BarrierExpression.BE_bot);
-				sk.push(be);
-			}
-		}
-		else if(stmt instanceof IASTDeclarationStatement){
-			boolean initialized = false;
-			IASTDeclarationStatement declStmt = (IASTDeclarationStatement)stmt;
-			IASTDeclaration decl = declStmt.getDeclaration();
-			if(decl instanceof IASTSimpleDeclaration){
-				IASTSimpleDeclaration simpleDecl = (IASTSimpleDeclaration)decl;
-				IASTDeclarator[] declarators = simpleDecl.getDeclarators();
-				for(int i=0; i<declarators.length; i++){
-					IASTInitializer init = declarators[i].getInitializer();
-					if(init != null){
-						initialized = true;
-						for(Enumeration<String> e = stacks_.keys(); e.hasMoreElements();){
-							String comm = e.nextElement();
-							Stack<BarrierExpression> sk = stacks_.get(comm);
-							be = getInitializerBE(sk, init);
-							sk.push(be);
-						}
-					}
-				}
-			}
-			if(!initialized){
-				for(Enumeration<String> e = stacks_.keys(); e.hasMoreElements();){
-					String comm = e.nextElement();
-					Stack<BarrierExpression> sk = stacks_.get(comm);
-					be = new BarrierExpression(BarrierExpression.BE_bot);
-					sk.push(be);
-				}
-			}
-		}
-		else if(stmt instanceof IASTDefaultStatement){
-			/* DefaultStatement = CaseStatement + BreakStatement */
-			IASTDefaultStatement dfStmt = (IASTDefaultStatement)stmt;
-			/* Override the old parent if it exists */
-			if(!caseParent.empty()) caseParent.pop();
-			caseParent.push(dfStmt.getParent());
-			
-			for(Enumeration<String> e = caseBE.keys(); e.hasMoreElements();){
-				String comm = e.nextElement();
-				Stack<List> caseBEsk = caseBE.get(comm);
-				Stack<BarrierExpression> sk = stacks_.get(comm);
-				be = new BarrierExpression(BarrierExpression.BE_bot);
-				List list = caseBEsk.peek();
-				list.add(dfStmt);
-				list.add(new CaseBarrierExpr(be, null));
-			}
-		}
-		else if(stmt instanceof IASTDoStatement){
-			IASTDoStatement doStmt = (IASTDoStatement)stmt;
-			for(Enumeration<String> e = stacks_.keys(); e.hasMoreElements();){
-				String comm = e.nextElement();
-				Stack<BarrierExpression> sk = stacks_.get(comm);
-				/* condition */
-				if(doStmt.getCondition() != null)
-					condBE = (BarrierExpression)sk.pop();
-				else
-					condBE = new BarrierExpression(BarrierExpression.BE_bot);
-				/* loop body */
-				if(doStmt.getBody() != null)
-					operand1 = (BarrierExpression)sk.pop();
-				else
-					operand1 = new BarrierExpression(BarrierExpression.BE_bot);
-				/* BE = body . cond. (body . cond)* */
-				be = BarrierExpression.concatBE(operand1, condBE, 
-						BarrierExpression.repeatBE(
-							BarrierExpression.concatBE(operand1, condBE), 
-								doStmt.getCondition(), stmt));
-				sk.push(be);
-				fixSwitch(comm, stmt, be);
-			}
-		}
-		else if(stmt instanceof IASTExpressionStatement){
-			for(Enumeration<String> e = stacks_.keys(); e.hasMoreElements();){
-				String comm = e.nextElement();
-				Stack<BarrierExpression> sk = stacks_.get(comm);
-				be = sk.pop();
-				sk.push(be);
-				fixSwitch(comm, stmt, be);
-			}
-		}
-		else if(stmt instanceof IASTForStatement){
-			IASTForStatement forStmt = (IASTForStatement)stmt;
-			BarrierExpression initBE = null;
-			BarrierExpression iterBE = null;
-			for(Enumeration<String> e = stacks_.keys(); e.hasMoreElements();){
-				String comm = e.nextElement();
-				Stack<BarrierExpression> sk = stacks_.get(comm);
-				/* loop body */
-				if(forStmt.getBody() != null)
-					operand1 = sk.pop();
-				else
-					operand1 = new BarrierExpression(BarrierExpression.BE_bot);
-				/* iterator */
-				if(forStmt.getIterationExpression() != null)
-					iterBE = sk.pop();
-				else
-					iterBE = new BarrierExpression(BarrierExpression.BE_bot);
-				/* condition */
-				if(forStmt.getConditionExpression() != null)
-					condBE = sk.pop();
-				else
-					condBE = new BarrierExpression(BarrierExpression.BE_bot);
-				/* initializer */
-				if(forStmt.getInitializerStatement() != null)
-					initBE = sk.pop();
-				else
-					initBE = new BarrierExpression(BarrierExpression.BE_bot);
-				/* BE = init . cond. (body . iter . cond)* */
-				be = BarrierExpression.concatBE(initBE, condBE, 
-						BarrierExpression.repeatBE(
-							BarrierExpression.concatBE(operand1, iterBE, condBE), 
-							forStmt.getConditionExpression(), stmt));
-				sk.push(be);
-				fixSwitch(comm, stmt, be);
-			}
-		} 
-		else if(stmt instanceof IASTGotoStatement){
-			/* TODO */
-		}
-		else if(stmt instanceof IASTIfStatement){
-			IASTIfStatement ifStmt = (IASTIfStatement)stmt;
-			for(Enumeration<String> e = stacks_.keys(); e.hasMoreElements();){
-				String comm = e.nextElement();
-				Stack<BarrierExpression> sk = stacks_.get(comm);
-				/* else clause */
-				if(ifStmt.getElseClause() != null)
-					operand2 = sk.pop();
-				else 
-					operand2 = new BarrierExpression(BarrierExpression.BE_bot);
-				/* then clause */
-				if(ifStmt.getThenClause() != null)
-					operand1 = sk.pop();
-				else
-					operand1 = new BarrierExpression(BarrierExpression.BE_bot);
-				/* condition*/
-				if(ifStmt.getConditionExpression() != null)
-					condBE = sk.pop();
-				else
-					condBE = new BarrierExpression(BarrierExpression.BE_bot);
-				/* BE = cond. (then | else) */
-				be = BarrierExpression.concatBE(condBE, 
-						BarrierExpression.branchBE(operand1, operand2, 
-							ifStmt.getConditionExpression(), stmt));
-				sk.push(be); 		
-				fixSwitch(comm, stmt, be);
-			}
-		}
-		else if(stmt instanceof IASTLabelStatement){
-			/* TODO */
-		}
-		else if(stmt instanceof IASTNullStatement){
-			for(Enumeration<Stack<BarrierExpression>> e = stacks_.elements(); e.hasMoreElements();){
-				Stack<BarrierExpression> sk = e.nextElement();
-				be = new BarrierExpression(BarrierExpression.BE_bot);
-				sk.push(be);
-			}
-		}
-		else if(stmt instanceof IASTProblemStatement){
-			for(Enumeration<Stack<BarrierExpression>> e = stacks_.elements(); e.hasMoreElements();){
-				Stack<BarrierExpression> sk = e.nextElement();
-				be = new BarrierExpression(BarrierExpression.BE_bot);
-				sk.push(be);
-			}
-		}
-		else if(stmt instanceof IASTReturnStatement){
-			IASTReturnStatement rStmt = (IASTReturnStatement)stmt;
-			if(rStmt.getReturnValue() == null){
-				for(Enumeration<Stack<BarrierExpression>> e = stacks_.elements(); e.hasMoreElements();){
-					Stack<BarrierExpression> sk = e.nextElement();
-					be = new BarrierExpression(BarrierExpression.BE_bot);
-					sk.push(be);
-				}
-			} else {
-				for(Enumeration<String> e = caseBE.keys(); e.hasMoreElements();){
-					String comm = e.nextElement();
-					Stack<BarrierExpression> sk = stacks_.get(comm);
-					be = sk.pop();
-					sk.push(be);
-					if(!withBreak.empty()){
-						withBreak.pop();
-						withBreak.push(new Boolean(true));
-					}
-					fixSwitch(comm, rStmt, be);
-				}
-			}
-		}
-		else if(stmt instanceof IASTSwitchStatement){
-			IASTSwitchStatement swStmt = (IASTSwitchStatement)stmt;
-			for(Enumeration<String> e = caseBE.keys(); e.hasMoreElements();){
-				String comm = e.nextElement();
-				Stack<List> caseBEsk = caseBE.get(comm);
-				List list = caseBEsk.pop();
-				CaseBarrierExpr cbe = (CaseBarrierExpr)list.get(1);
-				operand1 = (BarrierExpression)cbe.getBE();
-				for(int i=3; i<list.size(); i+=2){
-					cbe = (CaseBarrierExpr)list.get(i);
-					operand2 = (BarrierExpression)cbe.getBE();
-					be = BarrierExpression.branchBE(operand1, operand2, 
-							swStmt.getControllerExpression(), stmt);
-					operand1 = be;
-				}
-				Stack<BarrierExpression> sk = stacks_.get(comm);
-				sk.pop();
-				sk.push(operand1);
-			}
-			withBreak.pop();
-			caseParent.pop();
-			depth --;
-		}
-		else if(stmt instanceof IASTWhileStatement){
-			IASTWhileStatement whStmt = (IASTWhileStatement)stmt;
-			for(Enumeration<String> e = stacks_.keys(); e.hasMoreElements();){
-				String comm = e.nextElement();
-				Stack<BarrierExpression> sk = stacks_.get(comm);
-				/* loop body */
-				if(whStmt.getBody() != null)
-					operand1 = sk.pop();
-				else
-					operand1 = new BarrierExpression(BarrierExpression.BE_bot);
-				/* condition */
-				if(whStmt.getCondition() != null) 
-					condBE = sk.pop();
-				else
-					condBE = new BarrierExpression(BarrierExpression.BE_bot);
-				/* BE = cond . (body . cond)*  */
-				be = BarrierExpression.concatBE(condBE, 
-						BarrierExpression.repeatBE(
-							BarrierExpression.concatBE(operand1, condBE), 
-								whStmt.getCondition(), stmt));
-				sk.push(be);
-				fixSwitch(comm, stmt, be);
-			}
-		}
-
-		return PROCESS_CONTINUE;
-	}
-	
-	/** 
-	 * If the current statement is a case body
-	 */
-	private void fixSwitch(String key, IASTStatement stmt, BarrierExpression BE){
-		if(depth <= 0) return;
-		if(stmt.getParent() == caseParent.peek()){
-			Stack<List> caseBEsk = caseBE.get(key);
-			List list = caseBEsk.peek();
-			boolean flag = ((Boolean)withBreak.peek()).booleanValue();
-			for(int i = 1; i<list.size(); i+=2){
-				CaseBarrierExpr cbe = (CaseBarrierExpr)list.get(i);
-				if(flag)
-					cbe.addFinalBEElement(BE);
-				else 
-					cbe.addBEElement(BE);
-			}
-		}
-	}
-	
-	private boolean inCaseStmt(IASTBreakStatement stmt){
-		IASTNode parent = stmt.getParent();
-		while(parent != null){
-			if(parent instanceof IASTForStatement ||
-			   parent instanceof IASTDoStatement ||
-			   parent instanceof IASTWhileStatement)
-				return false;
-			else if(parent instanceof IASTSwitchStatement)
-				return true;
-			else if(parent instanceof IASTFunctionDefinition)
-				return false;
-			else
-				parent = parent.getParent();
-		}
-		return false;
-	}
-	
-	private BarrierExpression getInitializerBE(Stack sk, IASTInitializer init){		
-		BarrierExpression BE = null;
-		if(init instanceof IASTInitializerExpression){
-			BE = (BarrierExpression)sk.pop();
-		}
-		else if(init instanceof IASTInitializerList){
-			IASTInitializerList list = (IASTInitializerList)init;
-			IASTInitializer[] inits = list.getInitializers();
-			for(int j = 0; j<inits.length; j++){
-				if(BE == null)
-					BE = getInitializerBE(sk, inits[j]);
-				else
-					BE = BarrierExpression.concatBE(BE, 
-							getInitializerBE(sk, inits[j]));
-			}
-		}
-		return BE;
-	}
-	
-	/*
-	 * An expression which doesn't have any "expression" 
-	 * field is a terminal. 
-	 */
-	public int leave(IASTExpression expr){
-		BarrierExpression be = null;
-		BarrierExpression operand1 = null;
-		BarrierExpression operand2 = null;
-		BarrierExpression operand3 = null;
-		
-		if(expr instanceof IASTAmbiguousExpression){
-			/* nothing */
-		}
-		else if(expr instanceof IASTArraySubscriptExpression){
-			for(Enumeration<Stack<BarrierExpression>> e = stacks_.elements(); e.hasMoreElements();){
-				Stack<BarrierExpression> sk = e.nextElement();
-				operand2 = sk.pop();  //subscript
-				operand1 = sk.pop();  //array
-				be = BarrierExpression.concatBE(operand1, operand2);
-				sk.push(be);
-			}
-		}
-		else if(expr instanceof IASTBinaryExpression){
-			for(Enumeration<Stack<BarrierExpression>> e = stacks_.elements(); e.hasMoreElements();){
-				Stack<BarrierExpression> sk = e.nextElement();
-				operand2 = sk.pop();
-				operand1 = sk.pop();
-				be = BarrierExpression.concatBE(operand1, operand2);
-				sk.push(be);
-			}
-		}
-		else if(expr instanceof IASTCastExpression){
-			/* Has only one operator, leave it there */
-		}
-		else if(expr instanceof IASTConditionalExpression){
-			IASTConditionalExpression cExpr = (IASTConditionalExpression)expr;
-			IASTNode parent = expr.getParent();
-			while(! (parent instanceof IASTStatement) )
-				parent = parent.getParent();
-			for(Enumeration<Stack<BarrierExpression>> e = stacks_.elements(); e.hasMoreElements();){
-				Stack<BarrierExpression> sk = e.nextElement();
-				operand2 = sk.pop(); /* negative */
-				operand1 = sk.pop(); /* positive */
-				operand3 = sk.pop(); /* condition */
-				/* E = C ( P | N ) */
-				be = BarrierExpression.concatBE(operand3, 
-						BarrierExpression.branchBE(operand1, operand2, 
-								cExpr.getLogicalConditionExpression(), 
-								(IASTStatement)parent));
-				sk.push(be);
-			}
-		}
-		else if(expr instanceof IASTExpressionList){
-			IASTExpressionList exprList = (IASTExpressionList)expr;
-			IASTExpression[] exps = exprList.getExpressions();
-			if(exps.length == 0) return PROCESS_CONTINUE;
-			for(Enumeration<Stack<BarrierExpression>> e = stacks_.elements(); e.hasMoreElements();){
-				Stack<BarrierExpression> sk = e.nextElement();
-				int count = 0;
-				int i;
-				BarrierExpression[] BElist = new BarrierExpression[exps.length];
-				for(i=0; i<exps.length; i++){
-					if(exps[i] == null) continue;
-					BElist[count] = sk.pop();
-					count ++;
-				}
-				operand1 = BElist[count-1];
-				for (i = count-2; i >= 0; i-- ) {
-					operand2 = BElist[i];
-					be = BarrierExpression.concatBE(operand1, operand2);
-					operand1 = be;
-				}
-				sk.push(operand1);
-			}
-		}
-		else if(expr instanceof IASTFieldReference){
-			/*
-			for(Enumeration e = stacks_.elements(); e.hasMoreElements();){
-				Stack sk = (Stack)e.nextElement();
-				operand2 = (BarrierExpression)sk.pop(); //name
-				operand1 = (BarrierExpression)sk.pop(); //owner
-				be = BarrierExpression.concatBE(operand1, operand2);
-				sk.push(be);
-			}
-			*/
-		}
-		else if(expr instanceof IASTFunctionCallExpression){
-			IASTFunctionCallExpression fExpr = (IASTFunctionCallExpression)expr;
-			IASTExpression funcname = fExpr.getFunctionNameExpression();
-			IASTExpression parameter = fExpr.getParameterExpression();
-			String signature = funcname.getRawSignature();
-			int id = bTable_.isBarrier(fExpr);
-			if(id != -1){ /* barrier */
-				be = new BarrierExpression(id);
-				String comm = bTable_.getComm(id);
-				for(Enumeration<String> e = stacks_.keys(); e.hasMoreElements();){
-					String commkey = e.nextElement();
-					Stack<BarrierExpression> sk = stacks_.get(commkey);
-					if(parameter != null) sk.pop(); //parameter 
-					sk.pop(); //functionName
-					if(commkey.equals(comm)) sk.push(be);
-					else sk.push(new BarrierExpression(BarrierExpression.BE_bot));
-				}
-			}
-			else{
-				MPICallGraphNode node = (MPICallGraphNode)cg_.getNode(currentNode_.getFileName(), signature);
-				if(node != null && node.barrierRelated()){ 
-					/* a function (directly or indirectly) with barriers */
-					for(Enumeration<String> e = stacks_.keys(); e.hasMoreElements();){
-						String comm = e.nextElement();
-						Stack<BarrierExpression> sk = stacks_.get(comm);
-						BarrierExpression funcBE = node.getBarrierExpr().get(comm);
-						if(parameter != null) sk.pop(); //parameter
-						sk.pop(); //functionName
-						if(node == currentNode_){ //recursive functions
-							be = new BarrierExpression(node.getFuncName());
-						}
-						else if(funcBE.isBot()){
-							be = new BarrierExpression(BarrierExpression.BE_bot);
-						} 
-						else{
-							be = new BarrierExpression(signature);
-						}
-						sk.push(be);
-					}
-				} else { //not a barrier related function
-					be = new BarrierExpression(BarrierExpression.BE_bot);
-					for(Enumeration<Stack<BarrierExpression>> e = stacks_.elements(); e.hasMoreElements();){
-						Stack<BarrierExpression> sk = e.nextElement();
-						if(parameter != null) sk.pop(); //parameter
-						sk.pop(); //functionName
-						sk.push(be);
-					}
-				}
-			}
-		}
-		else if(expr instanceof IASTIdExpression){ //terminal
-			//System.out.println(((IASTIdExpression)expr).getName().toString());
-			for(Enumeration<Stack<BarrierExpression>> e = stacks_.elements(); e.hasMoreElements();){
-				Stack<BarrierExpression> sk = e.nextElement();
-				be = new BarrierExpression(BarrierExpression.BE_bot);
-				sk.push(be);
-			}
-		}
-		else if(expr instanceof IASTLiteralExpression){ //terminal
-			//System.out.println(((IASTLiteralExpression)expr).toString());
-			for(Enumeration<Stack<BarrierExpression>> e = stacks_.elements(); e.hasMoreElements();){
-				Stack<BarrierExpression> sk = e.nextElement();
-				be = new BarrierExpression(BarrierExpression.BE_bot);
-				sk.push(be);
-			}
-		}
-		/*
-		else if(expr instanceof IASTProblemExpression){
-			System.out.println("IASTProblemExpression");
-		}
-		*/
-		else if(expr instanceof IASTTypeIdExpression){
-			for(Enumeration<Stack<BarrierExpression>> e = stacks_.elements(); e.hasMoreElements();){
-				Stack<BarrierExpression> sk = e.nextElement();
-				be = new BarrierExpression(BarrierExpression.BE_bot);
-				sk.push(be);
-			}
-		}
-		else if(expr instanceof IASTUnaryExpression){
-			/* has only one operand, leave it there */
-		}
-		/*
-		else if(expr instanceof ICASTTypeIdInitializerExpression){
-			System.out.println("ICASTTypeIdInitializerExpression");
-		}
-		*/
-		return PROCESS_CONTINUE;
-	}
-
-	class CaseBarrierExpr{
-		protected BarrierExpression BE;
-		protected boolean closed;
-		protected IASTExpression cond;
-		
-		CaseBarrierExpr(BarrierExpression be, IASTExpression cond){
-			BE = be;
-			closed = false;
-			this.cond = cond;
-		}
-		
-		public void close() { closed = true; }
-		public BarrierExpression getBE() {return BE;}
-		public IASTExpression getCond() {return cond;}
-
-		public void addBEElement(BarrierExpression be){
-			if(closed) return;
-			if(BE == null){
-				BE = be;
-			} else {
-				BE = BarrierExpression.concatBE(BE, be);
-			}
-		}
-		
-		public void addFinalBEElement(BarrierExpression be){
-			addBEElement(be);
-			close();
-		}
-	}
-	
-	protected void checkBarrierRecursion(){
-		for(Iterator<List<ICallGraphNode>> i=cg_.getCycles().iterator(); i.hasNext();){
-			List<ICallGraphNode> cycle = i.next();
-			boolean barrierRelated = false;
-			for(Iterator<ICallGraphNode> ii = cycle.iterator(); ii.hasNext();){
-				MPICallGraphNode node = (MPICallGraphNode)ii.next();
-				if(node.barrierRelated){
-					barrierRelated = true;
-					break;
-				}
-			}
-			if(!barrierRelated) continue;
-			if(cycle.size() > 1){
-				System.out.println("Multi-Function barrier related cycles"); //$NON-NLS-1$
-				return;
-			}
-			currentNode_ = (MPICallGraphNode)cycle.get(0);
-			for(Enumeration<String> e = currentNode_.getBarrierExpr().keys(); e.hasMoreElements();){
-				String comm = e.nextElement();
-				BarrierExpression BE = currentNode_.getBarrierExpr().get(comm);
-				if(recursion(BE) == recursionError){
-					System.out.println("Recursion Error in " + comm); //$NON-NLS-1$
-				}
-			}
-			
-		}
-	}
-	
-	protected final int recursionCorrect = 0;
-	protected final int recursionError = 1;
-	protected final int noRecursion = 2;
-	
-	protected int recursion(BarrierExpression BE){
-		System.out.println(BE.prettyPrinter());
-		BarrierExpressionOP OP = BE.getOP();
-		if(OP == null){
-			if(BE.isFunc()){ //function call
-				String funcName = BE.getFuncName();
-				MPICallGraphNode fnode = (MPICallGraphNode)cg_.getNode(currentNode_.getFileName(), funcName);
-				if(fnode == currentNode_)
-					return recursionCorrect;
-				else 
-					return noRecursion;
-			}
-			else
-				return noRecursion;
-		}
-		else if(OP.getOperator() == BarrierExpressionOP.op_concat){
-			int v1 = recursion(BE.getOP1());
-			int v2 = recursion(BE.getOP2());
-			if(v1 == recursionError || v2 == recursionError)
-				return recursionError;
-			else if(v1 == recursionCorrect || v2 == recursionCorrect)
-				return recursionCorrect;
-			else 
-				return noRecursion;
-
-		}
-		else if(OP.getOperator() == BarrierExpressionOP.op_branch){
-			int v1 = recursion(BE.getOP1());
-			int v2 = recursion(BE.getOP2());
-			if(v1 == noRecursion && v2 == noRecursion)
-				return noRecursion;
-			else
-				return recursionError;
-		}
-		else { //BarrierExpressionOP.op_repeat
-			return recursion(BE.getOP1());
-
-		}
-	}
-
-
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIBarrierMatching.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIBarrierMatching.java
deleted file mode 100644
index 35280b0..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIBarrierMatching.java
+++ /dev/null

@@ -1,827 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,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.analysis.analysis;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Stack;
-
-import org.eclipse.cdt.core.dom.ast.IASTDoStatement;
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
-import org.eclipse.cdt.core.dom.ast.IASTForStatement;
-import org.eclipse.cdt.core.dom.ast.IASTIfStatement;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTNodeLocation;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.cdt.core.dom.ast.IASTSwitchStatement;
-import org.eclipse.cdt.core.dom.ast.IASTWhileStatement;
-import org.eclipse.cdt.internal.core.dom.parser.c.CASTCompoundStatement;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.ptp.pldt.common.Artifact;
-import org.eclipse.ptp.pldt.common.util.SourceInfo;
-import org.eclipse.ptp.pldt.mpi.analysis.IDs;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.BarrierExpression.BarrierExpressionOP;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.BarrierTable.BarrierInfo;
-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.messages.Messages;
-import org.eclipse.ptp.pldt.mpi.analysis.popup.actions.ShowMatchSet;
-
-public class MPIBarrierMatching {
-	protected ICallGraph cg_;
-	protected IControlFlowGraph cfg_;
-	protected MPICallGraphNode currentFunc_;
-	protected String currentComm_;
-	
-	protected Hashtable<BarrierExpression,List<BarrierExpression>> visited_;
-	protected BarrierTable barrierTable_; 
-	protected List<ErrorMessage> barrierErrors_;
-	protected boolean error;
-	
-	protected int mv = 0;
-	protected int sv = 0;
-	private static final boolean traceOn=false;
-	
-	public MPIBarrierMatching(ICallGraph cg, BarrierTable table){
-		cg_ = cg;
-		barrierTable_ = table;
-		visited_ = new Hashtable<BarrierExpression,List<BarrierExpression>>();
-		barrierErrors_ = new ArrayList<ErrorMessage>();
-	}
-	
-	public List<ErrorMessage> getErrors(){
-		return barrierErrors_;
-	}
-	
-	/**
-	 * Determine matching of MPI barriers.
-	 * @param reportErrors if true, produces a popup warning of barrier errors when found.
-	 * <br>if false, no popup occurs. Useful for running under JUnit test, with no user interaction.
-	 * Note that reportErrors is also used to make sure only a single error is reported -
-	 * the popup warning, if shown, is only shown once per analysis.
-	 * @since 4.0
-	 */
-	public void run(boolean reportErrors){
-		for(ICallGraphNode n = cg_.botEntry(); n != null; n = n.botNext()){
-			MPICallGraphNode node = (MPICallGraphNode)n;
-			if(!node.marked || !node.barrierRelated()) continue;
-			//System.out.println(node.getFuncName());
-			currentFunc_ = node;
-			cfg_ = node.getCFG();
-			Hashtable<String,BarrierExpression> barrierExpr = node.getBarrierExpr();
-			for(Enumeration<String> e = barrierExpr.keys(); e.hasMoreElements();){
-				currentComm_ = (String)e.nextElement();
-				BarrierExpression be = barrierExpr.get(currentComm_);
-				error = false;
-				fixedLength(be);
-				if(error){
-					// Don't report an error dialog for *each* barrier matching error found
-					// Only the first one, if at all
-					if (reportErrors) {
-						reportErrors=false; // don't report any more
-						String errorMsg = Messages.MPIBarrierMatching_foundBarrierSyncError;
-						MessageDialog.openInformation(ShowMatchSet
-								.getStandardDisplay().getActiveShell(),
-								Messages.MPIBarrierMatching_mpiBarrierAnalysis, errorMsg);
-					}
-					
-				}
-				findMatches(be);
-			}
-		}
-		//symmMatches();
-		if(traceOn)printMatches();
-		if(traceOn)System.out.println("mv = " + mv + ", sv = " + sv); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	protected void fixedLength(BarrierExpression BE){
-		//System.out.println(BE.prettyPrinter());
-		BarrierExpressionOP OP = BE.getOP();
-		if(OP == null){
-			if(BE.isBot()){
-				BE.setLength(0);
-			}
-			else if(BE.isBarrier()){
-				BE.setLength(1);
-			}
-			else { //function call
-				String funcName = BE.getFuncName();
-				MPICallGraphNode fnode = (MPICallGraphNode)cg_.getNode(currentFunc_.getFileName(), funcName);
-				if(fnode != null && fnode.barrierRelated()){
-					if(fnode.isRecursive())
-						BE.setLength(BarrierExpression.TOP);
-					else{
-						BarrierExpression fBE = fnode.getBarrierExpr().get(currentComm_);
-						BE.setLength(fBE.getLength());
-					}
-				} else {
-					BE.setLength(0);
-				}
-			}
-		}
-		else if(OP.getOperator() == BarrierExpressionOP.op_concat){
-			BarrierExpression oprd1 = BE.getOP1();
-			BarrierExpression oprd2 = BE.getOP2();
-			fixedLength(oprd1);
-			fixedLength(oprd2);
-			int length1 = oprd1.getLength();
-			int length2 = oprd2.getLength();
-
-			if(length1 == BarrierExpression.TOP || length2 == BarrierExpression.TOP){
-				BE.setLength(BarrierExpression.TOP);
-			} else {
-				BE.setLength(length1 + length2);
-			}
-		}
-		else if(OP.getOperator() == BarrierExpressionOP.op_branch){
-			/* need special treatment for conditional expression */
-			BarrierExpression oprd1 = BE.getOP1();
-			BarrierExpression oprd2 = BE.getOP2();
-			fixedLength(oprd1);
-			fixedLength(oprd2);
-			int length1 = oprd1.getLength();
-			int length2 = oprd2.getLength();
-			MPIBlock cond = (MPIBlock)cfg_.getBlock(OP.getCondition(), OP.getStatement());
-			if(cond.getMV()) mv ++;
-			else sv ++;
-			if(length1 == BarrierExpression.TOP || length2 == BarrierExpression.TOP){
-				BE.setLength(BarrierExpression.TOP);
-				if(cond.getMV()){
-					BE.setErrorFlag(true);
-					if(!(oprd1.getErrorFlag() || oprd2.getErrorFlag())){
-						// We only report errors in the lowest level
-						reportWarning(BE);
-					}
-				}
-			} else if(length1 == length2){
-				BE.setLength(length1);
-			} else { // length1 != TOP && length2 != TOP && length1 != length2
-				BE.setLength(BarrierExpression.TOP);
-				if(cond.getMV()){
-					BE.setErrorFlag(true);
-					if(!(oprd1.getErrorFlag() || oprd2.getErrorFlag())){
-						reportWarning(BE);
-					}
-					
-				}
-			}
-		}
-		else { //BarrierExpressionOP.op_repeat
-			BarrierExpression oprd = BE.getOP1();
-			fixedLength(oprd);
-			MPIBlock cond = (MPIBlock)cfg_.getBlock(OP.getCondition(), OP.getStatement());
-			if(cond.getMV()) mv ++;
-			else sv ++;
-			if(oprd.getLength() == 0){
-				BE.setLength(0);
-			} else {
-				BE.setLength(BarrierExpression.TOP);
-				if(cond.getMV()){
-					BE.setErrorFlag(true);
-					if(!oprd.getErrorFlag()){
-						reportWarning(BE);
-					}
-					
-				}
-			}
-		}
-	}
-	
-	protected void reportWarning(BarrierExpression BE){
-		error = true;
-		
-		IASTStatement stmt = BE.getOP().getStatement();
-		if(traceOn)System.out.println("Barrier mismatching found in " + stmt); //$NON-NLS-1$
-		IASTExpression cond = null;
-		
-		if(stmt instanceof IASTIfStatement)
-			cond = ((IASTIfStatement)stmt).getConditionExpression();
-		else if(stmt instanceof IASTDoStatement)
-			cond = ((IASTDoStatement)stmt).getCondition();
-		else if(stmt instanceof IASTForStatement)
-			cond = ((IASTForStatement)stmt).getConditionExpression();
-		else if(stmt instanceof IASTWhileStatement)
-			cond = ((IASTWhileStatement)stmt).getCondition();
-		else if(stmt instanceof IASTSwitchStatement)
-			cond = ((IASTSwitchStatement)stmt).getControllerExpression();
-		else{
-			System.out.println("Barrier Expression doesn't have valid condition"); //$NON-NLS-1$
-			return;
-		}
-		
-		int line = -1;
-		IASTNodeLocation[] locations = cond.getNodeLocations();
-		if (locations.length == 1) {
-			IASTFileLocation astFileLocation = null;
-			if (locations[0] instanceof IASTFileLocation){
-				astFileLocation = (IASTFileLocation) locations[0];
-				line = astFileLocation.getStartingLineNumber();
-			}
-		}
-		
-		try{
-			// Don't want it to be a problem marker: then it's harder to delete (don't
-			// want to delete the other problem markers)
-			//IMarker m = currentFunc_.getResource().createMarker(IMarker.PROBLEM);
-			IMarker m = currentFunc_.getResource().createMarker(IDs.errorMarkerID);
-			//IMarker m = currentFunc_.getResource().createMarker(IDs.errorMarkerID);
-			m.setAttribute(IMarker.LINE_NUMBER, line);
-			m.setAttribute(IMarker.MESSAGE, Messages.MPIBarrierMatching_barrierSyncError);
-			m.setAttribute(IMarker.PRIORITY, IMarker.PRIORITY_HIGH);
-			m.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
-		}catch(CoreException e){
-			System.out.println("RM: exception creating markers."); //$NON-NLS-1$
-			e.printStackTrace();
-		}
-
-		ErrorMessage err = new ErrorMessage(cond, stmt, currentFunc_.getFuncName(), 
-				currentFunc_.getFileName(), currentFunc_.getResource());
-		counterExample(BE, err);
-		barrierErrors_.add(err);
-	}
-
-	private boolean changed = false;
-	
-	protected void counterExample(BarrierExpression BE, ErrorMessage err){
-		BarrierExpressionOP op = BE.getOP();
-		if(op.getOperator() == BarrierExpressionOP.op_branch){
-			List<PathNode> path1 = new ArrayList<PathNode>();
-			List<PathNode> path2 = new ArrayList<PathNode>();
-			boolean first = true;
-			while(true){
-				changed = false;
-				traverseBarrierExpr(path1, BE.getOP1(), cfg_);
-				traverseBarrierExpr(path2, BE.getOP2(), cfg_);
-				if(differentLength(path1, path2))
-					break;
-				if(!changed && !first){
-					System.out.println("We cannot find the counter example!"); //$NON-NLS-1$
-				}
-				if(first) first = true;
-				path1 = new ArrayList<PathNode>();
-				path2 = new ArrayList<PathNode>();
-			}
-			err.setPath1(path1);
-			err.setPath2(path2);
-			
-			if(traceOn)System.out.println("Path 1: "); //$NON-NLS-1$
-			for(Iterator<PathNode> i=path1.iterator(); i.hasNext();){
-				PathNode pn = i.next();
-				pn.print();
-				if(traceOn)System.out.print(", "); //$NON-NLS-1$
-			}
-			if(traceOn)System.out.println(" "); //$NON-NLS-1$
-			if(traceOn)System.out.println("Path 2: "); //$NON-NLS-1$
-			for(Iterator<PathNode> i=path2.iterator(); i.hasNext();){
-				PathNode pn = i.next();
-				pn.print();
-				if(traceOn)System.out.print(", "); //$NON-NLS-1$
-			}
-			if(traceOn)System.out.println(" "); //$NON-NLS-1$
-		}
-		else if(op.getOperator() == BarrierExpressionOP.op_repeat){
-			List<PathNode> path1 = new ArrayList<PathNode>();
-			traverseBarrierExpr(path1, BE.getOP1(), cfg_);
-			for(Iterator<PathNode> i = path1.iterator(); i.hasNext();){
-				PathNode pn = i.next();
-				pn.setRepeat(true);
-			}
-			err.setPath1(path1);
-			
-			if(traceOn)System.out.println("Path: "); //$NON-NLS-1$
-			for(Iterator<PathNode> i=path1.iterator(); i.hasNext();){
-				PathNode pn = i.next();
-				pn.print();
-				if(traceOn)System.out.print(", "); //$NON-NLS-1$
-			}
-			if(traceOn)System.out.println(" "); //$NON-NLS-1$
-		}
-	}
-	
-	protected void traverseBarrierExpr(List<PathNode> path, BarrierExpression BE, 
-			IControlFlowGraph cfg){
-		//System.out.println(BE.prettyPrinter());
-		BarrierExpressionOP op = BE.getOP();
-		if(op == null){
-			if(BE.isBot()){
-				return;
-			}
-			else if(BE.isBarrier()){
-				BarrierInfo barrier = barrierTable_.searchBarrierbyID(BE.getBarrierID());
-				PathNode pn = new PathNode(barrier, false);
-				path.add(pn);
-			}
-			else { //function call
-				String funcName = BE.getFuncName();
-				MPICallGraphNode fnode = (MPICallGraphNode)cg_.getNode(currentFunc_.getFileName(), funcName);
-				if(fnode != null && fnode.barrierRelated()){
-					BarrierExpression fBE = (BarrierExpression)fnode.getBarrierExpr().get(currentComm_);
-					traverseBarrierExpr(path, fBE, fnode.getCFG());
-				} else {
-					return;
-				}
-			}
-		}
-		else if(op.getOperator() == BarrierExpressionOP.op_branch){
-			MPIBlock cond = (MPIBlock)cfg.getBlock(op.getCondition(), op.getStatement());
-			if(cond.getMV()){ 
-				/* Concurrent branch. Both branches should have same lengths, 
-				 * thus it doesn't matter which branch to choose. By default 
-				 * we choose the left branch. 
-				 */
-				traverseBarrierExpr(path, BE.getOP1(), cfg);
-			} else if(BE.getLength() != BarrierExpression.TOP){
-				/* Both branches have same length that are not \TOP */
-				traverseBarrierExpr(path, BE.getOP1(), cfg);
-			} else if(changed){
-				/* Some change has been made somewhere else. So keep the 
-				 * previous choice at this point
-				 */
-				if(BE.getOP2().ceVisited)
-					traverseBarrierExpr(path, BE.getOP2(), cfg);
-				else
-					traverseBarrierExpr(path, BE.getOP1(), cfg);
-			} else {
-				/* Nothing changed till now */
-				if(BE.getOP2().ceVisited){
-					/* We cannot make any change. Keep the previous choice */
-					traverseBarrierExpr(path, BE.getOP2(), cfg);
-				} else if(BE.getOP1().ceVisited){
-					/* Make change here */
-					traverseBarrierExpr(path, BE.getOP2(), cfg);
-					changed = true;
-				} else {
-					/* This BE is visited the first time */
-					traverseBarrierExpr(path, BE.getOP1(), cfg);
-				}
-			}
-		}
-		else if(op.getOperator() == BarrierExpressionOP.op_concat){
-			traverseBarrierExpr(path, BE.getOP1(), cfg);
-			traverseBarrierExpr(path, BE.getOP2(), cfg);
-		}
-		else if(op.getOperator() == BarrierExpressionOP.op_repeat){
-			traverseBarrierExpr(path, BE.getOP1(), cfg);
-			for(Iterator<PathNode> i = path.iterator(); i.hasNext();){
-				PathNode pn = i.next();
-				pn.setRepeat(true);
-			}
-		}
-		BE.ceVisited = true;
-	}
-	
-	protected boolean differentLength(List<PathNode> path1, List<PathNode> path2){
-		if(path1.size() != path2.size()) return true;
-		for(int i = 0; i<path1.size(); i++){
-			if(path1.get(i).isRepeat() || path2.get(i).isRepeat())
-				return true;
-		}
-		return false;
-	}
-	
-	public class PathNode{
-		private BarrierInfo barrier_;
-		private boolean repeat;
-		
-		public PathNode(BarrierInfo barrier, boolean repeat){
-			this.barrier_ = barrier;
-			this.repeat = repeat;
-		}
-		
-		public PathNode(BarrierInfo barrier){
-			this.barrier_ = barrier;
-			repeat = false;
-		}
-		
-		public void setRepeat(boolean val){
-			repeat = val;
-		}
-		
-		public boolean isRepeat(){
-			return repeat;
-		}
-		
-		public BarrierInfo getBarrier(){
-			return barrier_;
-		}
-		
-		public void print(){
-			if(traceOn)System.out.print(barrier_.getID());
-			if(repeat)
-				if(traceOn)System.out.print("(*)"); //$NON-NLS-1$
-		}
-	}
-	
-	public class ErrorMessage{
-		private IASTExpression position_;
-		private IASTStatement errStmt_;
-		private String funcName_;
-		private String fileName_;
-		private SourceInfo sourceInfo_;
-		private SourceInfo path1SourceInfo_;
-		private SourceInfo path2SourceInfo_;
-		private IResource resource_;
-		private List<PathNode> path1_ = null;
-		private List<PathNode> path2_ = null;
-		private int length1 = 0;
-		private int length2 = 0;
-		
-		public ErrorMessage(IASTExpression pos, IASTStatement stmt, String funcName, 
-				String fileName, IResource res){
-			position_ = pos;
-			errStmt_ = stmt;
-			funcName_ = funcName;
-			fileName_ = fileName;
-			resource_ = res;
-			sourceInfo_ = getSourceInfo(position_);
-			if(errStmt_ instanceof IASTIfStatement){
-				IASTIfStatement ifS = (IASTIfStatement)errStmt_;
-				path1SourceInfo_ = getSourceInfo(ifS.getThenClause());
-				path2SourceInfo_ = getSourceInfo(ifS.getElseClause());
-			} else if(errStmt_ instanceof IASTDoStatement){
-				IASTDoStatement doS = (IASTDoStatement)errStmt_;
-				path1SourceInfo_ = getSourceInfo(doS.getBody());
-				path2SourceInfo_ = null;
-			} else if(errStmt_ instanceof IASTForStatement){
-				IASTForStatement forS = (IASTForStatement)errStmt_;
-				path1SourceInfo_ = getSourceInfo(forS.getBody());
-				path2SourceInfo_ = null;
-			} else if(errStmt_ instanceof IASTWhileStatement){
-				IASTWhileStatement whileS = (IASTWhileStatement)errStmt_;
-				path1SourceInfo_ = getSourceInfo(whileS.getBody());
-				path2SourceInfo_ = null;
-			} else if(errStmt_ instanceof IASTSwitchStatement){
-				IASTSwitchStatement switchS = (IASTSwitchStatement)errStmt_;
-				path1SourceInfo_ = getSourceInfo(switchS.getBody());
-				path2SourceInfo_ = path1SourceInfo_;
-			}
-		}
-		
-		SourceInfo getSourceInfo(IASTNode node){
-			SourceInfo sourceInfo = new SourceInfo();
-			if(node == null) return sourceInfo;
-			IASTNodeLocation[] locations = node.getNodeLocations();
-			if (locations.length == 1) {
-				IASTFileLocation astFileLocation = null;
-				if (locations[0] instanceof IASTFileLocation){
-					astFileLocation = (IASTFileLocation) locations[0];
-					sourceInfo.setStartingLine(astFileLocation.getStartingLineNumber());
-					sourceInfo.setStart(astFileLocation.getNodeOffset());
-					sourceInfo.setEnd(astFileLocation.getNodeOffset() + astFileLocation.getNodeLength());
-					sourceInfo.setConstructType(Artifact.NONE);
-				}
-			}
-			else {
-				//System.out.println("MPIBarrierMatching.getSourceInfo().. ! More than one IASTNodeLocation !");
-				// CASTCompoundStatement causes this.  Probably ok? assuming it descends into the child nodes
-				if (traceOn) {
-					if (node instanceof CASTCompoundStatement) {
-						CASTCompoundStatement cstmt = (CASTCompoundStatement) node;
-						System.out.println("Compound stmt: " + cstmt.getRawSignature()); //$NON-NLS-1$
-						IASTNodeLocation[] locs = cstmt.getNodeLocations();
-						for (int i = 0; i < locs.length; i++) {
-							IASTNodeLocation loc = locs[i];
-							System.out.println("  subnode: " + loc.toString()); //$NON-NLS-1$
-						}
-					}
-					
-				}
-			}
-			return sourceInfo; 
-		}
-		
-		public void setPath1(List<PathNode> path){
-			path1_ = path;
-			int count = 0;
-			for(Iterator<PathNode> i = path.iterator(); i.hasNext();){
-				PathNode pn = i.next();
-				if(pn.isRepeat()){
-					length1 = -1;
-					return;
-				} else {
-					count ++;
-				}
-			}
-			length1 = count;
-		}
-		
-		public void setPath2(List<PathNode> path){
-			path2_ = path;
-			int count = 0;
-			for(Iterator<PathNode> i = path.iterator(); i.hasNext();){
-				PathNode pn = i.next();
-				if(pn.isRepeat()){
-					length2 = -1;
-					return;
-				} else {
-					count ++;
-				}
-			}
-			length2 = count;
-		}
-		
-		public IASTExpression getPosition(){
-			return position_;
-		}
-		
-		public String getFuncName(){
-			return funcName_;
-		}
-		
-		public String getFileName(){
-			return fileName_;
-		}
-		
-		public SourceInfo getSourceInfo(){
-			return sourceInfo_;
-		}
-		
-		public SourceInfo getPath1SourceInfo(){
-			return path1SourceInfo_;
-		}
-		
-		public SourceInfo getPath2SourceInfo(){
-			return path2SourceInfo_;
-		}
-		
-		public IResource getResource(){
-			return resource_;
-		}
-		
-		public List<PathNode> getPath1(){
-			return path1_;
-		}
-		
-		public List<PathNode> getPath2(){
-			return path2_;
-		}
-		
-		public int getLength1(){
-			return length1;
-		}
-		
-		public int getLength2(){
-			return length2;
-		}
-	}
-	
-	protected void findMatches(BarrierExpression BE){
-		if(traceOn)System.out.println(BE.prettyPrinter());
-		BarrierExpressionOP OP = BE.getOP();
-		if(BE.visited) return;
-		BE.visited = true;
-		if(OP == null){
-			if(BE.isFunc()){
-				String funcName = BE.getFuncName();
-				MPICallGraphNode fnode = (MPICallGraphNode)cg_.getNode(currentFunc_.getFileName(), funcName);
-				if(fnode != null && fnode.barrierRelated()){
-					BarrierExpression fBE = (BarrierExpression)fnode.getBarrierExpr().get(currentComm_);
-					findMatches(fBE);
-				} 
-			} else {
-				lstack_ = new Stack<BarrierExpression>();
-				sstack_ = new Stack<BarrierExpression>();
-				workList_ = new LinkedList<Work>();
-				match(BE, BE, down);
-				while(!workList_.isEmpty()){
-					Work w = workList_.remove();
-					match(w.BE1_, w.BE2_, w.direction);
-				}
-			}
-		}
-		else if(OP.getOperator() == BarrierExpressionOP.op_concat){
-			BarrierExpression oprd1 = BE.getOP1();
-			BarrierExpression oprd2 = BE.getOP2();
-			findMatches(oprd1);
-			findMatches(oprd2);
-		}
-		else if(OP.getOperator() == BarrierExpressionOP.op_branch){
-			BarrierExpression oprd1 = BE.getOP1();
-			BarrierExpression oprd2 = BE.getOP2();
-			MPIBlock cond = (MPIBlock)cfg_.getBlock(OP.getCondition(), OP.getStatement());
-			if(cond.getMV()){ // concurrent branch
-				if(!BE.getErrorFlag()){
-					lstack_ = new Stack<BarrierExpression>();
-					sstack_ = new Stack<BarrierExpression>();
-					workList_ = new LinkedList<Work>();
-					match(oprd1, oprd2, down);
-					while(!workList_.isEmpty()){
-						Work w = workList_.remove();
-						match(w.BE1_, w.BE2_, w.direction);
-					}
-				}
-			}
-			if(!BE.getErrorFlag()){
-				findMatches(oprd1);
-				findMatches(oprd2);
-			}
-		}
-		else { //BarrierExpressionOP.op_repeat
-			if(!BE.getErrorFlag()){
-				BarrierExpression oprd = BE.getOP1();
-				findMatches(oprd);
-			}
-		}
-	}
-	
-	protected final int down = 0;
-	protected final int up = 1;
-	protected Stack<BarrierExpression> lstack_;
-	protected Stack<BarrierExpression> sstack_;
-	protected LinkedList<Work> workList_;
-	
-	class Work{
-		BarrierExpression BE1_;
-		BarrierExpression BE2_;
-		int direction;
-		
-		Work(BarrierExpression be1, BarrierExpression be2, int direction){
-			BE1_ = be1;
-			BE2_ = be2;
-			this.direction = direction;
-		}
-	}
-	
-	protected void match(BarrierExpression BE1, BarrierExpression BE2, int dir){
-		BarrierExpression T1 = BE1;
-		BarrierExpression T2 = BE2;
-		int direction = dir;
-		while(true){
-			if(traceOn)System.out.println("match: "+T1.prettyPrinter()); //$NON-NLS-1$
-			if(traceOn)System.out.println("       "+T2.prettyPrinter()); //$NON-NLS-1$
-			if(direction == down) {if(traceOn)System.out.println("       down");} //$NON-NLS-1$
-			else {if(traceOn)System.out.println("       up");} //$NON-NLS-1$
-			
-			if(direction == down && !pairVisited(T1, T2))
-				addVisitedPair(T1, T2);
-		
-			BarrierExpressionOP OP1 = T1.getOP();
-			BarrierExpressionOP OP2 = T2.getOP();
-			
-			if(direction == up && T1 == BE1 && T2 == BE2) break;
-			else if(direction == down && OP1 == null && OP2 == null && 
-					T1.isBot() && T2.isBot())
-				direction = up;
-			else if(direction == down && OP1 == null && OP2 == null && 
-					T1.isBarrier() && T2.isBarrier()){
-				addMatchedPair(T1, T2); // BRT 5 and 5 ???
-				addMatchedPair(T1, T1);
-				addMatchedPair(T2, T2);
-				direction = up;
-			} else if(direction == down && OP1 == null && T1.isFunc()){ //rule 7
-				String funcName = T1.getFuncName();
-				MPICallGraphNode fnode = (MPICallGraphNode)cg_.getNode(currentFunc_.getFileName(), funcName);
-				if(fnode == null || !fnode.barrierRelated()){
-					System.out.println("Error in call graph"); //$NON-NLS-1$
-				}
-				BarrierExpression fBE = (BarrierExpression)fnode.getBarrierExpr().get(currentComm_);
-				lstack_.push(T1);
-				T1 = fBE;
-			} else if(direction == down && OP2 == null && T2.isFunc()){ //rule 7
-				String funcName = T2.getFuncName();
-				MPICallGraphNode fnode = (MPICallGraphNode)cg_.getNode(currentFunc_.getFileName(), funcName);
-				if(fnode == null || !fnode.barrierRelated()){
-					System.out.println("Error in call graph"); //$NON-NLS-1$
-				}
-				BarrierExpression fBE = (BarrierExpression)fnode.getBarrierExpr().get(currentComm_);
-				sstack_.push(T2);
-				T2 = fBE;
-			} else if(direction == down && OP1 != null && 
-					OP1.getOperator() == BarrierExpressionOP.op_concat){ //rule 2
-				T1 = T1.getOP1();
-			} else if(direction == down && OP2 != null && 
-					OP2.getOperator() == BarrierExpressionOP.op_concat){ //rule 2
-				T2 = T2.getOP1();
-			} else if(direction == up && T1.getParent() == null){ //rule 8
-				T1 = lstack_.pop();
-			} else if(direction == up && T2.getParent() == null){ //rule 8
-				T2 = sstack_.pop();
-			} else if(direction == up && 
-					T1.getParent().getOP().getOperator() == BarrierExpressionOP.op_concat
-					&& T1 == T1.getParent().getOP2()){ //rule 3
-				T1 = T1.getParent();
-				direction = up;
-			} else if(direction == up && 
-					T2.getParent().getOP().getOperator() == BarrierExpressionOP.op_concat
-					&& T2 == T2.getParent().getOP2()){ //rule 3
-				T2 = T2.getParent();
-				direction = up;
-			} else if(direction == up && T1.getParent().getOP().getOperator() == BarrierExpressionOP.op_concat
-					&& T1 == T1.getParent().getOP1()
-					&& T2.getParent().getOP().getOperator() == BarrierExpressionOP.op_concat
-					&& T2 == T2.getParent().getOP1()){ //rule 4
-				T1 = T1.getParent().getOP2();
-				T2 = T2.getParent().getOP2();
-				direction = down;
-			} else if(direction == down && OP1 != null && 
-					OP1.getOperator() == BarrierExpressionOP.op_branch){ //rule 5
-				workList_.add(new Work(T1.getOP2(), T2, down));
-				T1 = T1.getOP1();
-			} else if(direction == down && OP2 != null && 
-					OP2.getOperator() == BarrierExpressionOP.op_branch){ //rule 5
-				workList_.add(new Work(T1, T2.getOP2(), down));
-				T2 = T2.getOP1();
-			} else if(direction == up && 
-					T1.getParent().getOP().getOperator() == BarrierExpressionOP.op_branch){ 
-				//rule 6
-				T1 = T1.getParent();
-			} else if(direction == up &&
-					T2.getParent().getOP().getOperator() == BarrierExpressionOP.op_branch){ 
-				//rule 6
-				T2 = T2.getParent();
-			} else{
-				System.out.println("cannot find rules for " + T1.prettyPrinter()  //$NON-NLS-1$
-					+ " and " + T2.prettyPrinter() + " and direction = " + direction); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-	}
-	
-	protected void addVisitedPair(BarrierExpression b1, BarrierExpression b2){
-		List<BarrierExpression> visitedPair = visited_.get(b1);
-		if(visitedPair == null){
-			visitedPair = new ArrayList<BarrierExpression>();
-			visitedPair.add(b2);
-			visited_.put(b1, visitedPair);
-		} else {
-			if(!visitedPair.contains(b2)) visitedPair.add(b2);
-		}
-		
-		visitedPair = visited_.get(b2);
-		if(visitedPair == null){
-			visitedPair = new ArrayList<BarrierExpression>();
-			visitedPair.add(b1);
-			visited_.put(b2, visitedPair);
-		} else {
-			if(!visitedPair.contains(b1)) visitedPair.add(b1);
-		}
-		
-	}
-	
-	protected boolean pairVisited(BarrierExpression b1, BarrierExpression b2){
-		List<BarrierExpression> pair = visited_.get(b1);
-		if(pair == null || !pair.contains(b2))
-			return false;
-		else
-			return true;
-	}
-	
-	protected void addMatchedPair(BarrierExpression b1, BarrierExpression b2){
-		BarrierInfo bar1 = barrierTable_.searchBarrierbyID(b1.getBarrierID());
-		BarrierInfo bar2 = barrierTable_.searchBarrierbyID(b2.getBarrierID());
-		List<BarrierInfo> set1 = bar1.getMatchingSet();
-		List<BarrierInfo> set2 = bar2.getMatchingSet();
-		if(!set1.contains(bar2)) set1.add(bar2); // adds to matchingSet_
-		if(!set2.contains(bar1)) set2.add(bar1);
-	}
-	
-	protected void symmMatches(){
-		for(Enumeration<List<BarrierInfo>> e = barrierTable_.getTable().elements(); e.hasMoreElements();){
-			List<BarrierInfo> list = e.nextElement();
-			for(Iterator<BarrierInfo> i = list.iterator(); i.hasNext();){
-				BarrierInfo bar = i.next();
-				if(traceOn)System.out.println("bar = " + bar.getID()); //$NON-NLS-1$
-				for(Iterator<BarrierInfo> ii = bar.getMatchingSet().iterator(); ii.hasNext();){
-					BarrierInfo matchedBar = ii.next();
-					if(traceOn)System.out.println("matchedBar = " + matchedBar.getID()); //$NON-NLS-1$
-					if(!matchedBar.getMatchingSet().contains(bar)){
-						if(traceOn)System.out.println("bar = " + bar.getID() + ", matchedBar = " + matchedBar.getID()); //$NON-NLS-1$ //$NON-NLS-2$
-						matchedBar.getMatchingSet().add(bar);
-					}
-				}
-			}
-		}
-	}
-	
-	protected void printMatches(){
-		for(Enumeration<List<BarrierInfo>> e = barrierTable_.getTable().elements(); e.hasMoreElements();){
-			List<BarrierInfo> list = e.nextElement();
-			for(Iterator<BarrierInfo> i = list.iterator(); i.hasNext();){
-				BarrierInfo bar = i.next();
-				if(traceOn)System.out.print("Barrier " + bar.getID() + " matches to : "); //$NON-NLS-1$ //$NON-NLS-2$
-				for(Iterator<BarrierInfo> ii = bar.getMatchingSet().iterator(); ii.hasNext();){
-					BarrierInfo matchedBar = ii.next();
-					if(traceOn)System.out.print(matchedBar.getID() + ", "); //$NON-NLS-1$
-				}
-			}		
-			if(traceOn)System.out.println(" "); //$NON-NLS-1$
-		}
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIBlock.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIBlock.java
deleted file mode 100644
index 36f9cd9..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIBlock.java
+++ /dev/null

@@ -1,259 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,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.analysis.analysis;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.*;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.IBlock;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.impl.Block;
-
-
-public class MPIBlock extends Block{
-	
-	/** Used  variables in this block */
-	protected List<String> use_;
-
-	/** Defined variables in this block */
-	protected List<String> def_;
-	
-	/** In, Out, Gen and Kill for each variable */
-	protected Hashtable<String,List<IBlock>> in_;
-	protected Hashtable<String,List<IBlock>> out_;
-	protected Hashtable<String,List<IBlock>> gen_;
-	protected Hashtable<String,List<IBlock>> kill_;
-	
-	/** Reaching definitions (flow dependence) */
-	protected Hashtable<String/*var*/,List<IBlock>> duPred_;
-	/** Reaching uses */
-	protected Hashtable<String/*var*/,List<IBlock>> duSucc_; 
-	
-	/** Dominator Frontier */
-	protected List<IBlock> df_;
-
-	/** This records the condition block from which different paths 
-	 * are generated. Similar as Gated SSA. Note that there may or may 
-	 * not be a \phi node in "this" block, depends on whether there is
-	 * variable definition along the paths from cond_ to this block. 
-	 */ 
-	protected List<IBlock> condBlock_;
-	//protected IBlock condBlock_;
-	protected List<IBlock> joinBlocks_;
-	
-	/** A set of variables introduced by \Phi functions. Such variables
-	 * are regarded as being both used and defined in this block */
-	protected List<String> phiVar_;
-	/** A set variables that are used and also introduced by placing a
-	 * \phi function, that is, there is a data dependence from the 
-	 * \phi function to the originally used variable. */
-	protected List<String> usedPhiVar_;
-	/** This block contains a \phi node ? */
-	protected boolean phi;
-	
-	/** list of multi-valued variables (in this block?  BRT) */
-	protected List<String> mvVar_;
-	protected List<String> oldMVvar_;
-	
-	private boolean mv;
-	
-	boolean sliced;
-	/** For \phi node placement */
-	int hasAlready;
-	int work;
-	
-	boolean withBreak = false;
-	boolean withContinue = false;
-	
-	public MPIBlock(){
-		super();
-		init();
-	}
-		
-	public MPIBlock(IASTNode content, IASTStatement parent, int type){
-		super(content, parent, type);
-		init();
-	}
-	
-	public MPIBlock(IASTExpression expr, IASTStatement parent){
-		super(expr, parent);
-		init();
-	}
-	
-	public MPIBlock(IASTStatement stmt){
-		super(stmt);
-		init();
-	}
-	
-	public MPIBlock(IASTName label){
-		super(label);
-		init();
-	}
-	
-		
-	private void init(){
-		
-		use_ = new ArrayList<String>();
-		def_ = new ArrayList<String>();
-
-		in_ = new Hashtable<String,List<IBlock>>();
-		out_ = new Hashtable<String,List<IBlock>>();
-		gen_ = new Hashtable<String,List<IBlock>>();
-		kill_ = new Hashtable<String,List<IBlock>>();
-		
-		duPred_ = new Hashtable<String,List<IBlock>>();
-		duSucc_ = new Hashtable<String,List<IBlock>>();
-		
-		df_ = new ArrayList<IBlock>();
-		condBlock_ = new ArrayList<IBlock>();
-		//condBlock_ = null;
-		joinBlocks_ = new ArrayList<IBlock>();
-		phi = false;
-		phiVar_ = new ArrayList<String>();
-		usedPhiVar_ = new ArrayList<String>();
-		
-		mvVar_ = new ArrayList<String>();
-		oldMVvar_ = new ArrayList<String>();
-		
-		sliced = false;
-		mv = false;
-	}
-
-	public void setCond(List<IBlock> b){condBlock_ = b;}
-	public List<IBlock> getCond(){return condBlock_;}
-	public List<IBlock> getJoin(){return joinBlocks_;}
-
-	public List<String> getUse(){return use_;}
-	public void setUse(List<String> set){use_ = set;}
-	public List<String> getDef(){return def_;}
-	public void setDef(List<String> set){def_ = set;}
-
-	public void setIn(Hashtable<String,List<IBlock>> in){in_ = in;}
-	public void setOut(Hashtable<String,List<IBlock>> out) {out_ = out;}
-	public Hashtable<String,List<IBlock>> getIn() {return in_;}
-	public Hashtable<String,List<IBlock>> getOut() {return out_;}
-	
-	public void setGen(Hashtable<String,List<IBlock>> gen){gen_ = gen;}
-	public void setKill(Hashtable<String,List<IBlock>> kill) {kill_ = kill;}
-	public Hashtable<String,List<IBlock>> getGen() {return gen_;}
-	public Hashtable<String,List<IBlock>> getKill() {return kill_;}
-	
-	public void setDUPred(Hashtable<String,List<IBlock>> pred){duPred_ = pred;}
-	public void setDUSucc(Hashtable<String,List<IBlock>> succ) {duSucc_ = succ;}
-	public Hashtable<String,List<IBlock>> getDUPred() {return duPred_;}
-	public Hashtable<String,List<IBlock>> getDUSucc() {return duSucc_;}
-	
-	public void setDF(List<IBlock> list){df_ = list;}
-	public List<IBlock> getDF(){return df_;}
-	public void setPhi(){phi = true;}
-	public boolean hasPhi(){return phi;}
-	public List<String> getPhiVar(){return phiVar_;}
-	public List<String> getUsedPhiVar(){return usedPhiVar_;}
-	
-	public List<String> getMVvar() {return mvVar_;}
-	public void setMVvar(List<String> list){mvVar_ = list;}
-	public List<String> getOldMVvar() {return oldMVvar_;}
-	public void setOldMVvar(List<String> list) {oldMVvar_ = list;}
-	
-	//private static int countMV=0;  // BRT for debugging
-	public void setMV(boolean val){
-		 //countMV++;
-		 //System.out.println("setMV: "+val+"   "+countMV+" blockID: "+getID()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		 mv = val;
-		}
-	public boolean getMV(){return mv;}
-	
-	public void print(){
-		super.print();
-		
-		System.out.print("joins to: "); //$NON-NLS-1$
-		for(Iterator<IBlock> i = joinBlocks_.iterator(); i.hasNext();){
-			System.out.print(i.next().getID() + ", "); //$NON-NLS-1$
-		}
-		System.out.println(" "); //$NON-NLS-1$
-		
-		System.out.print(" use = "); //$NON-NLS-1$
-		for(Iterator<String> i = use_.iterator(); i.hasNext();){
-			System.out.print(i.next() + ", "); //$NON-NLS-1$
-		}
-		System.out.print(" def = "); //$NON-NLS-1$
-		for(Iterator<String> i = def_.iterator(); i.hasNext();){
-			System.out.print(i.next() + ", "); //$NON-NLS-1$
-		}
-		System.out.println(" "); //$NON-NLS-1$
-
-		System.out.println("Flow dependence: "); //$NON-NLS-1$
-		for(Enumeration<String> e = duSucc_.keys(); e.hasMoreElements();){
-			String var = e.nextElement();
-			List<IBlock> list = duSucc_.get(var);
-			if(list.isEmpty()) continue;
-			System.out.print(var + " to: "); //$NON-NLS-1$
-			for(Iterator<IBlock> i = list.iterator(); i.hasNext();){
-				System.out.print(i.next().getID() + ", "); //$NON-NLS-1$
-			}
-			System.out.println(" "); //$NON-NLS-1$
-		}
-		System.out.println(" "); //$NON-NLS-1$
-		
-		if(mv) System.out.println("------ Multi-valued ------"); //$NON-NLS-1$
-		else System.out.println("------ Single-valued ------"); //$NON-NLS-1$
-		System.out.println(" "); //$NON-NLS-1$
-		System.out.println(" "); //$NON-NLS-1$
-	}
-	
-	/** reset the block ID counter */
-	public static void clean(){
-		counter = 0;
-	}
- 
-
-	public String toString(){
-		super.print();
-		StringBuffer buf = new StringBuffer();
-		
-		buf.append("joins to: "); //$NON-NLS-1$
-		for(Iterator<IBlock> i = joinBlocks_.iterator(); i.hasNext();){
-			buf.append(i.next().getID() + ", "); //$NON-NLS-1$
-		}
-		buf.append(" \n"); //$NON-NLS-1$
-		
-		buf.append(" use = "); //$NON-NLS-1$
-		for(Iterator<String> i = use_.iterator(); i.hasNext();){
-			buf.append(i.next() + ", "); //$NON-NLS-1$
-		}
-		buf.append(" def = "); //$NON-NLS-1$
-		for(Iterator<String> i = def_.iterator(); i.hasNext();){
-			buf.append(i.next() + ", "); //$NON-NLS-1$
-		}
-		buf.append(" \n"); //$NON-NLS-1$
-	
-		buf.append("Flow dependence: \n"); //$NON-NLS-1$
-		for(Enumeration<String> e = duSucc_.keys(); e.hasMoreElements();){
-			String var = e.nextElement();
-			List<IBlock> list = duSucc_.get(var);
-			if(list.isEmpty()) continue;
-			buf.append(var + " to: "); //$NON-NLS-1$
-			for(Iterator<IBlock> i = list.iterator(); i.hasNext();){
-				buf.append(i.next().getID() + ", "); //$NON-NLS-1$
-			}
-			buf.append(" \n"); //$NON-NLS-1$
-		}
-		buf.append(" \n"); //$NON-NLS-1$
-		
-		if(mv) buf.append("------ Multi-valued ------\n"); //$NON-NLS-1$
-		else buf.append("------ Single-valued ------\n"); //$NON-NLS-1$
-		return buf.toString();
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPICFGBuilder.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPICFGBuilder.java
deleted file mode 100644
index 17deed7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPICFGBuilder.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis.analysis;
-
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraph;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraphNode;
-
-public class MPICFGBuilder {
-	protected ICallGraph cg_;
-	
-	public MPICFGBuilder(ICallGraph cg){
-		cg_ = cg;
-	}
-	
-	public void run(){
-		for(ICallGraphNode n = cg_.topEntry(); n != null; n = n.topNext()){
-			MPICallGraphNode node = (MPICallGraphNode)n;
-			if(!node.marked) continue;
-			//if(node.getFuncName().equals("yyparse"))
-				//System.out.println(node.getFuncName());
-			MPIControlFlowGraph cfg = new MPIControlFlowGraph(node.getFuncDef().getBody());
-			cfg.buildCFG();
-			n.setCFG(cfg);
-			//cfg.print();
-		}
-		MPIBlock.clean();
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPICallGraph.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPICallGraph.java
deleted file mode 100644
index 39c44ff..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPICallGraph.java
+++ /dev/null

@@ -1,232 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis.analysis;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Stack;
-
-import org.eclipse.cdt.core.dom.ast.*;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.BarrierTable.BarrierInfo;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraphNode;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.impl.CallGraph;
-
-public class MPICallGraph extends CallGraph{
-	/** Is the global variable pointer type? */
-	protected List<Boolean> gvPointer_;
-	protected BarrierTable btable_;
-	protected int count;
-	private static final boolean traceOn=false;
-	
-	public MPICallGraph()
-	{
-		super();
-		btable_ = new BarrierTable();
-		count = 4; // 0-3 are types in BarrierExpression
-		gvPointer_ = new ArrayList<Boolean>();
-	}
-	
-	public List<Boolean> getGVPointer(){return gvPointer_;}
-	
-	public BarrierTable getBarrierTable(){return btable_;}
-	
-	public void otherOP(){
-		//FunctionPointerChecker fpc = new FunctionPointerChecker();
-		//fpc.run();
-		FunctionMarker fm = new FunctionMarker();
-		fm.run();
-		checkBarrierRelatedCycles();
-		if(traceOn)System.out.println((btable_.commCounter + 1) + " communicators "); //$NON-NLS-1$
-	}	
-	
-	class FunctionPointerChecker extends ASTVisitor{
-		protected ICallGraphNode currentFunc_;
-		protected boolean funcPointer = false;
-		
-		public boolean hasFuncPointer(){return funcPointer;}
-		
-		public void run(){
-			this.shouldVisitDeclarations = true;
-			this.shouldVisitStatements = true;
-			this.shouldVisitExpressions = true;
-			for(Iterator<ICallGraphNode> i = nodes_.iterator(); i.hasNext();){
-				currentFunc_ = i.next();
-				currentFunc_.getFuncDef().accept(this);
-			}
-		}
-		
-		protected Stack<String> funcCall = new Stack<String>();
-		
-		public int visit(IASTExpression expr){
-			if(expr instanceof IASTFunctionCallExpression){
-				IASTFunctionCallExpression funcE = (IASTFunctionCallExpression)expr;
-				IASTExpression funcname = funcE.getFunctionNameExpression();
-				String signature = funcname.getRawSignature();
-				funcCall.push(signature);
-			} 
-			else if(expr instanceof IASTIdExpression){
-				IASTIdExpression idE = (IASTIdExpression)expr;
-				String name = idE.getName().toString();
-				if(!funcCall.empty() && name.equals(funcCall.peek())){
-					funcCall.pop();
-				} else {
-					ICallGraphNode node = getNode(currentFunc_.getFileName(), name);
-					if(node != null){
-						funcPointer = true;
-						System.out.println("Function Pointer " + name + " in " +  //$NON-NLS-1$ //$NON-NLS-2$
-								currentFunc_.getFuncName() + "(" + currentFunc_.getFileName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
-					}
-				}
-			}
-			return PROCESS_CONTINUE;
-		}
-	}
-	
-	class FunctionMarker extends ASTVisitor{
-		protected MPICallGraphNode currentNode_ = null;
-		
-		public void run()
-		{
-			this.shouldVisitExpressions = true;
-			this.shouldVisitStatements = true;
-			this.shouldVisitDeclarations = true;
-			
-			for(Iterator<ICallGraphNode> i = nodes_.iterator(); i.hasNext();){
-				currentNode_ = (MPICallGraphNode)i.next();
-				//System.out.println(currentNode_.getFuncName());
-				currentNode_.getFuncDef().accept(this);
-			}
-			
-			for(Iterator<ICallGraphNode> i = nodes_.iterator(); i.hasNext();){
-				currentNode_ = (MPICallGraphNode)i.next();
-				//System.out.println(currentNode_.getFuncName());
-				markBarrierRelated(currentNode_);
-			}
-			for(Iterator<ICallGraphNode> i = nodes_.iterator(); i.hasNext();){
-				currentNode_  = (MPICallGraphNode)i.next();
-				markMPIInit(currentNode_);
-			}
-			
-			markFunction();
-			count = count -4;
-		}
-		
-		public int visit(IASTExpression expression) 
-		{
-			if (expression instanceof IASTFunctionCallExpression) {
-				IASTFunctionCallExpression funcExpr = (IASTFunctionCallExpression)expression;
-				IASTExpression funcname = funcExpr.getFunctionNameExpression();
-				String signature = funcname.getRawSignature();
-				if(signature.equals("MPI_Barrier")){ //$NON-NLS-1$
-					count ++;
-					BarrierInfo newbar = btable_.addBarrier(funcExpr, count, 
-							currentNode_.getResource(), currentNode_.getFuncName());
-					currentNode_.setBarrierRelated(true);
-					currentNode_.getAllBarriers().add(newbar);
-				}
-				else if(signature.equals("MPI_Init")){ //$NON-NLS-1$
-					currentNode_.mpiInit = true;
-				}
-			}
-			return PROCESS_CONTINUE;
-		}
-		
-		/* Functions that directly call barriers (MPI_Barrier()) and their
-		 * ancestors are barrier-related
-		 */
-		protected void markBarrierRelated(MPICallGraphNode node){
-			if(node.barrierRelated()){
-				//System.out.println(node.getName());
-				for(Iterator<ICallGraphNode> ii = node.getCallers().iterator(); ii.hasNext();){
-					MPICallGraphNode caller = (MPICallGraphNode)ii.next();
-					if(!caller.barrierRelated()){
-						caller.setBarrierRelated(true);
-						markBarrierRelated(caller);
-					}
-				}
-			}
-		}
-		protected void markMPIInit(MPICallGraphNode node){
-			if(node.mpiInit){
-				for(Iterator<ICallGraphNode> ii = node.getCallers().iterator(); ii.hasNext();){
-					MPICallGraphNode caller = (MPICallGraphNode)ii.next();
-					if(!caller.mpiInit){
-						caller.mpiInit = true;
-						markMPIInit(caller);
-					}
-				}
-			}
-		}
-		
-		/** A function is marked if:<br>
-		 * (1) It is a barrier-related function<br>
-		 * (2) It is called by (1)<br>
-		 * (3) It is an MPI Initialization function (call MPI_Init)<br>
-		 * (4) It is an ancestor of (3)<br>
-		 * (5) It is called by (4)
-		 */
-		protected void markFunction(){
-			int total = nodes_.size();
-			int marked = 0;
-			
-			for(ICallGraphNode node = topEntry_; node != null; node = node.topNext()){
-				currentNode_ = (MPICallGraphNode)node;
-				if(currentNode_.barrierRelated() || currentNode_.mpiInit){
-					currentNode_.marked = true;
-					marked ++;
-				}
-			}
-			
-			boolean changed = true;
-			while(changed){
-				changed = false;
-				for(ICallGraphNode node = topEntry_; node != null; node = node.topNext()){
-					currentNode_ = (MPICallGraphNode)node;
-					if(currentNode_.marked){
-						for(Iterator<ICallGraphNode> i = currentNode_.getCallees().iterator(); i.hasNext();){
-							MPICallGraphNode callee = (MPICallGraphNode)i.next();
-							if(!callee.marked){
-								callee.marked = true;
-								marked ++;
-								changed = true;
-							}
-						}
-					}
-				}
-			}
-			if(traceOn)System.out.println(marked + " out of " + total + " functions are marked"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-	
-	protected void checkBarrierRelatedCycles(){
-
-		for(Iterator<List<ICallGraphNode>> i=cycles_.iterator(); i.hasNext();){
-			List<ICallGraphNode> cycle = i.next();
-			boolean barrierRelated = false;
-			for(Iterator<ICallGraphNode> ii = cycle.iterator(); ii.hasNext();){
-				MPICallGraphNode node = (MPICallGraphNode)ii.next();
-				if(node.barrierRelated){
-					barrierRelated = true;
-					break;
-				}
-			}
-			if(!barrierRelated) continue;
-			String errorMsg = new String("Barrier related recursive function calls on: "); //$NON-NLS-1$
-			for(Iterator<ICallGraphNode> ii = cycle.iterator(); ii.hasNext();){
-				ICallGraphNode func = ii.next();
-				errorMsg = errorMsg + func.getFuncName() + "(" + func.getFileName() + "), "; //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			System.out.println(errorMsg);
-		}
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPICallGraphNode.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPICallGraphNode.java
deleted file mode 100644
index b1ef13f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPICallGraphNode.java
+++ /dev/null

@@ -1,174 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,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.analysis.analysis;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.BarrierTable.BarrierInfo;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.IBlock;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.impl.CallGraphNode;
-
-public class MPICallGraphNode extends CallGraphNode {
-
-	/** Used (defined) global variables in this function */
-	protected List<String> globalUse_;
-	protected List<String> globalDef_;
-	/** Defined parameters that can be propagated to its callers */
-	protected List<String> paramDef_;
-	
-	protected boolean barrierRelated;
-	/** One barrier expression for each communicator */
-	protected Hashtable<String,BarrierExpression> barrierExpr_;
-	/** The list of all barriers */
-	protected List<BarrierInfo> barriers_;
-	
-	/** Is the parameter multi-valued in any call ? 
-	 * One entry for each parameter
-	 */
-	protected Hashtable<String,Boolean> paramMV_;
-	/** Is the return value multi-valued? */
-	protected boolean mv;
-	
-	/** For each parameter or used global variable "V", summarize
-	 * a set of MV data (passable parameters, defined global vars,
-	 * and returned value) if V is MV. 
-	 */
-	protected Hashtable<String,List<String>> mvSummary_; 
-	
-	/**
-	 * A table storing each defined variable V in this function and 
-	 * the set of blocks that contain the definitions of V. This is
-	 * used in \phi node placement.
-	 */
-	protected Hashtable<String,List<IBlock>> defTable_;
-	
-	/** hashtable contains number of assignments for each variable (local vars, global vars, 
-	 * and parameters) 
-	 */
-	protected Hashtable<String,Integer> saVar_;
-	protected Hashtable<String,Boolean> saVarPointer_;
-	
-	protected boolean hasSeed;
-	
-	boolean mpiInit = false;
-	public boolean marked = false;
-	
-	public MPICallGraphNode(IResource resource, String filename, 
-			String funcname, IASTFunctionDefinition fdef){
-		super(resource, filename, funcname, fdef);
-		init();
-	}
-
-	public MPICallGraphNode(IResource resource, String filename, 
-			IASTFunctionDefinition fdef){
-		super(resource, filename, fdef);
-		init();
-	}
-	
-	private void init(){
-		globalUse_ = new ArrayList<String>();
-		globalDef_ = new ArrayList<String>();
-		paramDef_ = new ArrayList<String>();
-		defTable_ = new Hashtable<String,List<IBlock>>();
-		
-		barrierRelated = false;
-		barrierExpr_ = new Hashtable<String,BarrierExpression>();
-		barriers_ = new ArrayList<BarrierInfo>();
-		
-		paramMV_ = new Hashtable<String,Boolean>();
-		mvSummary_ = new Hashtable<String,List<String>>();
-		
-		saVar_ = new Hashtable<String,Integer>();
-		saVarPointer_ = new Hashtable<String,Boolean>();
-		
-		mv = false;
-		hasSeed = false;
-	}
-	
-	public boolean barrierRelated(){
-		return barrierRelated;
-	}
-	
-	public void setBarrierRelated(boolean val){
-		barrierRelated = val;
-	}
-	
-	public Hashtable<String,BarrierExpression> getBarrierExpr(){
-		return barrierExpr_;
-	}
-	
-	public List<BarrierInfo> getAllBarriers(){
-		return barriers_;
-	}
-	
-	public void setBarrierExpr(String comm, BarrierExpression be){
-		barrierExpr_.put(comm, be);
-	}
-	
-	public void setGlobalUse(List<String> list){
-		globalUse_ = list;
-	}
-	
-	public List<String> getGlobalUse(){
-		return globalUse_;
-	}
-	
-	public void setGlobalDef(List<String> list){
-		globalDef_ = list;
-	}
-	
-	public List<String> getGlobalDef(){
-		return globalDef_;
-	}
-	
-	public void setParamDef(List<String> list){
-		paramDef_ = list;
-	}
-	
-	public List<String> getParamDef(){
-		return paramDef_;
-	}
-	
-	public void setDefTable(Hashtable<String,List<IBlock>> defs){
-		defTable_ = defs;
-	}
-	
-	public Hashtable<String,List<IBlock>> getDefTable(){
-		return defTable_;
-	}
-	
-	public Hashtable<String,Boolean> getParamMV(){
-		return paramMV_;
-	}
-
-	public void setMV(boolean val){
-		mv = val;
-	}
-	
-	public boolean getMV(){
-		return mv;
-	}
-	
-	public Hashtable<String,List<String>> getMVSummary(){
-		return mvSummary_;
-	}	
-	
-	public Hashtable<String,Integer> getSAVar(){return saVar_;}
-	public Hashtable<String,Boolean> getSAVarPointer(){return saVarPointer_;}
-	
-	public boolean hasSeed(){return hasSeed;}
-	public void setSeed(boolean val){hasSeed = val;}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIControlFlowGraph.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIControlFlowGraph.java
deleted file mode 100644
index bfa1134..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIControlFlowGraph.java
+++ /dev/null

@@ -1,350 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis.analysis;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Iterator;
-
-import org.eclipse.cdt.core.dom.ast.*;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.IBlock;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.impl.Block;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.impl.ControlFlowGraph;
-
-
-public class MPIControlFlowGraph extends ControlFlowGraph{
-
-	/** a set of return statement flowing to the exit block */
-	protected List<IBlock> returnBlocks_;
-	private static final boolean traceOn = false;
-	
-	public MPIControlFlowGraph(IASTStatement funcBody){
-		super(funcBody);
-	}
-
-	public List<IBlock> getReturnBlocks(){return returnBlocks_;}
-	
-	protected void collectBlocks(){
-		entry_ = new MPIBlock();
-		exit_ = new MPIBlock();
-		MPIBlockCollector mbc = new MPIBlockCollector();
-		mbc.run();
-	}
-	
-	class MPIBlockCollector extends ASTVisitor{
-		public void run(){
-			this.shouldVisitStatements = true;
-			this.shouldVisitDeclarations = true;
-			prog_.accept(this);
-		}
-		
-		public int visit(IASTStatement stmt) 
-		{
-			MPIBlock block;
-			if(stmt instanceof IASTBreakStatement){
-				block = new MPIBlock(stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTCaseStatement){
-				block = new MPIBlock(stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTCompoundStatement){
-			} 
-			else if(stmt instanceof IASTContinueStatement){
-				block = new MPIBlock(stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTDeclarationStatement){
-				block = new MPIBlock(stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTDefaultStatement){
-				block = new MPIBlock(stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTDoStatement){
-				IASTDoStatement doStmt = (IASTDoStatement)stmt;
-				block = new MPIBlock(doStmt.getCondition(), stmt);
-				addBlock(block);
-				IBlock exitjoin = new MPIBlock(null, stmt, Block.exit_join_type);
-				addBlock(exitjoin);
-				IBlock continuejoin = new MPIBlock(null, stmt, Block.continue_join_type);
-				addBlock(continuejoin);
-			} 
-			else if(stmt instanceof IASTExpressionStatement){
-				block = new MPIBlock(stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTForStatement){
-				IASTForStatement forStmt = (IASTForStatement)stmt;
-				/* The initialization is a statement, and will be added later */
-				block = new MPIBlock(forStmt.getConditionExpression(), stmt);
-				addBlock(block);
-				if(forStmt.getIterationExpression() != null){
-					block = new MPIBlock(forStmt.getIterationExpression(), stmt);
-					addBlock(block);
-				}
-				IBlock continuejoin = new MPIBlock(null, stmt, Block.continue_join_type);
-				addBlock(continuejoin);
-				IBlock exitjoin = new MPIBlock(null, stmt, Block.exit_join_type);
-				addBlock(exitjoin);
-			} 
-			else if(stmt instanceof IASTGotoStatement){
-				block = new MPIBlock(stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTIfStatement){
-				IASTIfStatement ifStmt = (IASTIfStatement)stmt;
-				block = new MPIBlock(ifStmt.getConditionExpression(), stmt);
-				addBlock(block);
-				IBlock join = new MPIBlock(null, stmt, Block.exit_join_type);
-				addBlock(join);
-			} 
-			else if(stmt instanceof IASTLabelStatement){
-				IASTLabelStatement labelS = (IASTLabelStatement)stmt;
-				block = new MPIBlock(labelS.getName(), stmt, Block.label_type);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTNullStatement){
-				block = new MPIBlock(stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTProblemStatement){
-				block = new MPIBlock(stmt);
-				addBlock(block);
-			}
-			else if(stmt instanceof IASTReturnStatement){
-				IASTReturnStatement rtStmt = (IASTReturnStatement)stmt;
-				block = new MPIBlock(rtStmt.getReturnValue(), stmt);
-				addBlock(block);
-			} 
-			else if(stmt instanceof IASTSwitchStatement){
-				IASTSwitchStatement swStmt = (IASTSwitchStatement)stmt;
-				block = new MPIBlock(swStmt.getControllerExpression(), stmt);
-				addBlock(block);
-				IBlock join = new MPIBlock(null, stmt, Block.exit_join_type);
-				addBlock(join);
-			} 
-			else if(stmt instanceof IASTWhileStatement){
-				IASTWhileStatement whStmt = (IASTWhileStatement)stmt;
-				block = new MPIBlock(whStmt.getCondition(), stmt);
-				addBlock(block);
-				IBlock join = new MPIBlock(null, stmt, Block.continue_join_type);
-				addBlock(join);
-				IBlock exitjoin = new MPIBlock(null, stmt, Block.exit_join_type);
-				addBlock(exitjoin);
-			} 
-			return PROCESS_CONTINUE;
-		}
-	}
-	
-	protected void otherOPs(){
-		returnBlocks_ = new ArrayList<IBlock>();
-		PhiFlowBuilder phi = new PhiFlowBuilder();
-		phi.run();
-		BreakContinueChecker bcc = new BreakContinueChecker();
-		bcc.run();
-	}
-	
-	class PhiFlowBuilder extends FlowBuilder{
-		
-		public void run(){
-			this.shouldVisitStatements = true;
-			this.shouldVisitDeclarations = true;
-			this.shouldVisitTranslationUnit = true;
-			this.shouldVisitExpressions = true;
-			prog_.accept(this);
-		}
-		
-		public int visit(IASTStatement stmt){
-			if(stmt instanceof IASTBreakStatement){
-				if(traceOn) System.out.println("BreakStatement"); //$NON-NLS-1$
-				IASTNode parent = stmt.getParent();
-				List<IASTIfStatement> branches = new ArrayList<IASTIfStatement>();
-				while(true){
-					if(parent instanceof IASTDoStatement ||
-						parent instanceof IASTForStatement ||
-						parent instanceof IASTWhileStatement){
-						MPIBlock exitjoin = (MPIBlock)getBlock(null, 
-								(IASTStatement)parent, Block.exit_join_type);
-						for(Iterator<IASTIfStatement> i = branches.iterator(); i.hasNext();){
-							IASTIfStatement ifstmt = i.next();
-							MPIBlock ifcondblock = (MPIBlock)getBlock(ifstmt.getConditionExpression(), ifstmt);
-							PhiEdge(ifcondblock, exitjoin);
-						}
-						MPIBlock loopcondblock = null;
-						if(parent instanceof IASTDoStatement){
-							IASTDoStatement doS = (IASTDoStatement)parent;
-							loopcondblock = (MPIBlock)getBlock(doS.getCondition(), doS);
-						} else if(parent instanceof IASTForStatement){
-							IASTForStatement forS = (IASTForStatement)parent;
-							loopcondblock = (MPIBlock)getBlock(forS.getConditionExpression(), forS);
-						} else if(parent instanceof IASTWhileStatement){
-							IASTWhileStatement whileS = (IASTWhileStatement)parent;
-							loopcondblock = (MPIBlock)getBlock(whileS.getCondition(), whileS);
-						}
-						PhiEdge(loopcondblock, exitjoin);
-						break;
-					}
-					else if(parent instanceof IASTSwitchStatement){
-						MPIBlock exitjoin = (MPIBlock)getBlock(null, (IASTStatement)parent,
-								Block.exit_join_type);
-						IASTSwitchStatement swStmt = (IASTSwitchStatement)parent;
-						MPIBlock swcond = (MPIBlock)getBlock(swStmt.getControllerExpression(), 
-								(IASTStatement)parent);
-						PhiEdge(swcond, exitjoin);
-						break;
-					}
-					else if(parent instanceof IASTIfStatement){
-						branches.add((IASTIfStatement)parent);
-						parent = parent.getParent();
-					}
-					else{
-						parent = parent.getParent();
-					}
-				}
-			} 
-			else if(stmt instanceof IASTCaseStatement || 
-					stmt instanceof IASTDefaultStatement){
-				if(traceOn) System.out.println("CaseStatement or DefaultStatement"); //$NON-NLS-1$
-				IASTNode parent = stmt.getParent();
-				while(true){
-					if(parent instanceof IASTSwitchStatement) break;
-					else parent = parent.getParent();
-				}
-				IASTSwitchStatement swStmt = (IASTSwitchStatement)parent;
-				MPIBlock swblock = (MPIBlock)getBlock(swStmt.getControllerExpression(), 
-									(IASTStatement)parent);
-				MPIBlock caseblock = (MPIBlock)getBlock(stmt);
-				if(caseblock.getPreds().size() > 1){
-					/* Previous case without break joins here */
-					PhiEdge(swblock, caseblock);
-				}
-			} 
-			else if(stmt instanceof IASTContinueStatement){
-				if(traceOn) System.out.println("ContinueStatement"); //$NON-NLS-1$
-				IASTNode parent = stmt.getParent();
-				List<IASTIfStatement> branches = new ArrayList<IASTIfStatement>();
-				while(true){
-					if(parent instanceof IASTDoStatement ||
-							parent instanceof IASTForStatement ||
-							parent instanceof IASTWhileStatement){
-						MPIBlock continuejoin = (MPIBlock)getBlock(null, 
-								(IASTStatement)parent, Block.continue_join_type);
-						for(Iterator<IASTIfStatement> i = branches.iterator(); i.hasNext();){
-							IASTIfStatement ifS = i.next();
-							MPIBlock ifcondblock = (MPIBlock)getBlock(
-									ifS.getConditionExpression(), ifS);
-							PhiEdge(ifcondblock, continuejoin);
-						}
-						break;
-					}
-					else if(parent instanceof IASTIfStatement){
-						branches.add((IASTIfStatement)parent);
-						parent = parent.getParent();
-					}
-					else{
-						parent = parent.getParent();
-					}
-				}
-			} 
-			else if(stmt instanceof IASTDoStatement){
-				if(traceOn) System.out.println("DoStatement"); //$NON-NLS-1$
-				IASTDoStatement doStmt = (IASTDoStatement)stmt;
-				MPIBlock cond = (MPIBlock)getBlock(doStmt.getCondition(), stmt);
-				if(doStmt.getBody() != null){
-					MPIBlock first = (MPIBlock)firstBlock(doStmt.getBody());
-					PhiEdge(cond, first);
-				}
-			} 
-			else if(stmt instanceof IASTForStatement){
-				if(traceOn) System.out.println("ForStatement"); //$NON-NLS-1$
-				IASTForStatement forStmt = (IASTForStatement)stmt;
-				MPIBlock cond = (MPIBlock)getBlock(forStmt.getConditionExpression(), stmt);
-				PhiEdge(cond, cond);
-				
-			} 
-			else if(stmt instanceof IASTIfStatement){
-				if(traceOn) System.out.println("IfStatement"); //$NON-NLS-1$
-				IASTIfStatement ifStmt = (IASTIfStatement)stmt;
-				MPIBlock condb = (MPIBlock)getBlock(ifStmt.getConditionExpression(), stmt);
-				MPIBlock join = (MPIBlock)getBlock(null, stmt, Block.exit_join_type);
-				PhiEdge(condb, join);
-			} 
-			else if(stmt instanceof IASTReturnStatement){
-				if(traceOn) System.out.println("ReturnStatement"); //$NON-NLS-1$
-				IASTReturnStatement rtStmt = (IASTReturnStatement)stmt;
-				MPIBlock rv = (MPIBlock)getBlock(rtStmt.getReturnValue(), stmt);
-				returnBlocks_.add(rv);
-			} 
-			else if(stmt instanceof IASTWhileStatement){
-				if(traceOn) System.out.println("WhileStatement"); //$NON-NLS-1$
-				IASTWhileStatement whStmt = (IASTWhileStatement)stmt;
-				MPIBlock cond = (MPIBlock)getBlock(whStmt.getCondition(), stmt);
-				PhiEdge(cond, cond);
-			}
-			return PROCESS_CONTINUE;
-		}
-		
-		protected void PhiEdge(MPIBlock from, MPIBlock to){
-			if(!to.getCond().contains(from)) 
-				to.getCond().add(from);
-			List<IBlock> joins = from.getJoin();
-			if(!joins.contains(to)){ 
-				joins.add(to);
-				//System.out.println("Phi edge is added from " + from.getID() + " to " + to.getID());
-			}
-		}
-	}
-	
-	class BreakContinueChecker extends ASTVisitor{
-		
-		public void run(){
-			this.shouldVisitStatements = true;
-			this.shouldVisitDeclarations = true;
-			prog_.accept(this);
-		}
-		
-		public int visit(IASTStatement stmt){
-			if(stmt instanceof IASTBreakStatement ||
-					stmt instanceof IASTContinueStatement){
-				IASTNode parent = stmt.getParent();
-				while(parent != prog_){
-					if(parent instanceof IASTIfStatement){
-						break;
-					} else {
-						parent = parent.getParent();
-					}
-				}
-				if(!(parent instanceof IASTIfStatement)) 
-					return PROCESS_CONTINUE;
-				IASTIfStatement ifS = (IASTIfStatement)parent;
-				IASTExpression cond = ifS.getConditionExpression();
-				MPIBlock condBlock = (MPIBlock)getBlock(cond, ifS);
-				if(stmt instanceof IASTBreakStatement)
-					condBlock.withBreak = true;
-				else
-					condBlock.withContinue = true;
-			}
-			return PROCESS_CONTINUE;
-		}
-	}
-	
-	public void print(){
-		for(IBlock b = entry_; b != null; b = b.topNext()){
-			MPIBlock block = (MPIBlock)b;
-			block.print();
-		}
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIDUChain.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIDUChain.java
deleted file mode 100644
index 1b83608..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIDUChain.java
+++ /dev/null

@@ -1,163 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,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.analysis.analysis;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-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;
-
-/**
- * Calculate the DUchain -- data dependence (definition-use chain)
- * 
- * @author Yuan Zhang
- * @since 4.0
- * 
- */
-public class MPIDUChain {
-	protected ICallGraph cg_;
-
-	protected Hashtable<String, List<IBlock>> defTable_;
-	protected IControlFlowGraph cfg_;
-
-	public MPIDUChain(ICallGraph cg) {
-		cg_ = cg;
-	}
-
-	/**
-	 * The DUchain calculation contains three steps:<br>
-	 * (1) Calculate the set of used and defined variables in each block<br>
-	 * (2) Add \phi functions<br>
-	 * (3) Construct the DUchain
-	 */
-	public void run() {
-		UseDefBuilder ud = new UseDefBuilder(cg_);
-		ud.run();
-		MPISSA ssa = new MPISSA(cg_);
-		ssa.run();
-		duChain();
-	}
-
-	/**
-	 * Calculate the Gen and Kill sets for each block
-	 * 
-	 * @since 4.0
-	 */
-	protected void genKillSet() {
-		for (IBlock b = cfg_.getEntry(); b != null; b = b.topNext()) {
-			MPIBlock block = (MPIBlock) b;
-			for (Enumeration<String> e = defTable_.keys(); e.hasMoreElements();) {
-				String var = e.nextElement();
-				block.getGen().put(var, new ArrayList<IBlock>());
-				block.getKill().put(var, new ArrayList<IBlock>());
-				block.getIn().put(var, new ArrayList<IBlock>());
-				block.getOut().put(var, new ArrayList<IBlock>());
-				block.getDUPred().put(var, new ArrayList<IBlock>());
-				block.getDUSucc().put(var, new ArrayList<IBlock>());
-			}
-			List<String> def = block.getDef();
-			for (Iterator<String> i = def.iterator(); i.hasNext();) {
-				String var = i.next();
-				List<IBlock> genlist = new ArrayList<IBlock>();
-				genlist.add(block);
-				block.getGen().put(var, genlist);
-				List<IBlock> killlist = (List<IBlock>) ((ArrayList<IBlock>) defTable_.get(var)).clone();
-				killlist.remove(block);
-				block.getKill().put(var, killlist);
-			}
-		}
-	}
-
-	/**
-	 * Calculate the reaching definition
-	 * 
-	 * @since 4.0
-	 */
-	protected void reachingDefinition() {
-		for (IBlock b = cfg_.getEntry(); b != null; b = b.topNext()) {
-			MPIBlock block = (MPIBlock) b;
-			block.setOut((Hashtable<String, List<IBlock>>) block.getGen().clone());
-		}
-		boolean change = true;
-		while (change) {
-			change = false;
-			for (IBlock b = cfg_.getEntry(); b != null; b = b.topNext()) {
-				MPIBlock block = (MPIBlock) b;
-				Hashtable<String, List<IBlock>> in = block.getIn();
-				for (Iterator<IBlock> i = block.getPreds().iterator(); i.hasNext();) {
-					MPIBlock pred = (MPIBlock) i.next();
-					for (Enumeration<String> e = in.keys(); e.hasMoreElements();) {
-						String var = e.nextElement();
-						in.put(var, Util.Union(in.get(var), pred.getOut().get(var)));
-					}
-				}
-				Hashtable<String, List<IBlock>> out = block.getOut();
-				for (Enumeration<String> e = out.keys(); e.hasMoreElements();) {
-					String var = e.nextElement();
-					List outlist = Util.Union(block.getGen().get(var), Util.Minus(in.get(var), block.getKill().get(var)));
-					if (!Util.equals(outlist, out.get(var))) {
-						change = true;
-						out.put(var, outlist);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * @since 4.0
-	 */
-	protected void flowDependence() {
-		for (IBlock b = cfg_.getEntry(); b != null; b = b.topNext()) {
-			MPIBlock block = (MPIBlock) b;
-			Hashtable<String, List<IBlock>> in = block.getIn();
-			for (Enumeration<String> e = in.keys(); e.hasMoreElements();) {
-				String var = e.nextElement();
-				if (!block.getUse().contains(var))
-					continue;
-				List<IBlock> pred = block.getDUPred().get(var);
-				for (Iterator<IBlock> i = in.get(var).iterator(); i.hasNext();) {
-					MPIBlock rd = (MPIBlock) i.next();
-					List<IBlock> succ = rd.getDUSucc().get(var);
-					pred.add(rd);
-					succ.add(block);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Construct the definition-use chain
-	 * 
-	 * @since 4.0
-	 */
-	protected void duChain() {
-		for (ICallGraphNode n = cg_.botEntry(); n != null; n = n.botNext()) {
-			MPICallGraphNode node = (MPICallGraphNode) n;
-			if (!node.marked)
-				continue;
-			cfg_ = node.getCFG();
-			defTable_ = node.getDefTable();
-			genKillSet();
-			reachingDefinition();
-			flowDependence();
-			// ((MPIControlFlowGraph)cfg_).print();
-		}
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIMVAnalysis.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIMVAnalysis.java
deleted file mode 100644
index 5fa945b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIMVAnalysis.java
+++ /dev/null

@@ -1,1350 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,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.analysis.analysis;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Stack;
-
-import org.eclipse.cdt.core.dom.ast.*;
-import org.eclipse.cdt.core.dom.ast.c.ICASTTypeIdInitializerExpression;
-import org.eclipse.cdt.core.dom.ast.gnu.c.ICASTKnRFunctionDeclarator;
-import org.eclipse.cdt.internal.core.dom.parser.IASTAmbiguousExpression;
-import org.eclipse.cdt.internal.core.dom.parser.c.CASTBinaryExpression;
-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;
-
-/**
- * MPI Multi-Valued analysis
- * @author zhangyua
- *
- */
-public class MPIMVAnalysis{
-	protected ICallGraph cg_;
-	protected MPICallGraphNode currentNode_;
-	
-	protected final int lhs = 0;
-	protected final int rhs = 1;
-	
-	protected boolean changed = false;
-	private static final boolean traceOn=false;
-	
-	public MPIMVAnalysis(ICallGraph cg){
-		cg_ = cg;
-	}
-	
-	public void run(){
-		init();
-		SeedsCollector sc = new SeedsCollector();
-		sc.run();
-		functionMVSummary();
-		functionSlicing();
-		exprMVAnalysis();
-		
-		for(ICallGraphNode n = cg_.topEntry(); n != null; n = n.topNext()){
-			MPICallGraphNode node = (MPICallGraphNode)n;
-			if(!node.marked) continue;
-			IControlFlowGraph cfg = node.getCFG();
-			for(IBlock b = cfg.getEntry(); b != null; b = b.topNext()){
-				MPIBlock block = (MPIBlock)b;
-				if(block.getMV() && (block.withBreak || block.withContinue))
-					System.out.println("************  Multi-valued branch with Break/Continue in " +  //$NON-NLS-1$
-							node.getFuncName() + "(" + node.getFileName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-	}
-
-	/** Initialize all parameters of a function as single-valued; 
-	 * Initialize its MV and SV summary as empty
-	 */
-	private void init(){
-		for(ICallGraphNode n = cg_.topEntry(); n != null; n = n.topNext()){
-			MPICallGraphNode node = (MPICallGraphNode)n;
-			if(!node.marked) continue;
-			IASTFunctionDefinition fd = node.getFuncDef();
-			IASTFunctionDeclarator fdecl = fd.getDeclarator();
-			if(fdecl instanceof IASTStandardFunctionDeclarator){
-				IASTStandardFunctionDeclarator sfunc = (IASTStandardFunctionDeclarator)fdecl;
-				IASTParameterDeclaration[] params = sfunc.getParameters();
-				for(int i = 0; i < params.length; i++){
-					IASTName param = params[i].getDeclarator().getName();
-					if(param.toString().equals("")) continue; //void parameter //$NON-NLS-1$
-					node.getParamMV().put(param.toString(), new Boolean(false));
-					node.getMVSummary().put(param.toString(), new ArrayList<String>());
-				}
-			} else {
-				ICASTKnRFunctionDeclarator krfunc = (ICASTKnRFunctionDeclarator)fdecl;
-				IASTName[] params = krfunc.getParameterNames();
-				for(int i=0; i<params.length; i++){
-					node.getParamMV().put(params[i].toString(), new Boolean(false));
-					node.getMVSummary().put(params[i].toString(), new ArrayList<String>());
-				}
-			}
-			for(Iterator<String> i = node.getGlobalUse().iterator(); i.hasNext();){
-				String var = i.next();
-				node.getMVSummary().put(var, new ArrayList<String>());
-			}
-			/* Another entry if (1) the function has no parameter and no global use;
-			 * (2) all parameters and global uses are SV. 
-			 * (We call this function(context) as "empty MV input" function(context).)
-			 * Use the function name as the key in these cases
-			 */ 
-			node.getMVSummary().put(node.getFuncName(), new ArrayList<String>());
-		}
-	}
-	
-	private void functionMVSummary(){
-		changed = true;
-		while(changed){
-			changed = false;
-			for(ICallGraphNode n = cg_.botEntry(); n != null; n = n.botNext()){
-				MPICallGraphNode node = (MPICallGraphNode)n;
-				if(!node.marked) continue;
-				currentNode_ = node;
-				for(Enumeration<String> e = node.getMVSummary().keys(); e.hasMoreElements();){
-					String var = e.nextElement();
-					singleVariableSlicing(var);
-					/*
-					System.out.print("Summary: ");
-					for(Iterator i = ((ArrayList)node.getMVSummary().get(var)).iterator(); i.hasNext();){
-						System.out.print((String)i.next() + ", ");
-					}
-					System.out.println(" ");
-					*/
-					clean();
-				}
-			}
-		}
-	}
-	
-	/**
-	 *  For each function, assume all parameters are MV, find out which global
-	 * variables (and passable parameters) are MV
-	 */
-	private void singleVariableSlicing(String var){
-		IControlFlowGraph cfg = currentNode_.getCFG();
-		
-		WorkListCollector wlc = new WorkListCollector(currentNode_);
-		LinkedList<IBlock> seeds = wlc.getWorkList();
-		if(!var.equals(currentNode_.getFuncName())){
-			seeds.add(cfg.getEntry());
-			((MPIBlock)cfg.getEntry()).getMVvar().add(var);
-		}
-		
-		while(!seeds.isEmpty()){
-			MPIBlock block = (MPIBlock)seeds.remove();
-			if(block.sliced) continue;
-			block.sliced = true;
-			
-			if(block.getContent() == null) continue;
-			
-			Hashtable<String,List<IBlock>> DUSucc = block.getDUSucc();
-			List<String> mv = block.getMVvar();
-			List<String> newMV = new ArrayList<String>();
-			
-			handlePointers(block, mv);
-			
-			if(!block.getPhiVar().isEmpty()){
-				List<IBlock> cond = block.getCond();
-				int blockcase = 0;
-				for(Iterator<IBlock> i = cond.iterator(); i.hasNext();){
-					if(blockcase == 2) break;
-					MPIBlock condblock = (MPIBlock)i.next();
-					IASTStatement parent = condblock.getParent();
-					if(parent instanceof IASTIfStatement || 
-							parent instanceof IASTSwitchStatement)
-						blockcase = 1;
-					else if(parent instanceof IASTForStatement ||
-							parent instanceof IASTDoStatement ||
-							parent instanceof IASTWhileStatement){
-						if(block.getType() == MPIBlock.exit_join_type)
-							blockcase = 1;
-						else if(block.getType() == MPIBlock.expr_type)
-							blockcase = 2;
-					}
-				}
-				if(blockcase == 1){
-					newMV = Util.Union(newMV, block.getPhiVar());
-				}
-				else if(blockcase == 2){
-					for(Iterator<IBlock> i = cond.iterator(); i.hasNext();){
-						MPIBlock condblock = (MPIBlock)i.next();
-						for(Iterator<String> ii = condblock.getUsedPhiVar().iterator();
-								ii.hasNext();){
-							String v = ii.next();
-							if(mv.contains(v))
-								newMV.add(v);
-						}
-					}
-				}
-			}	
-			
-			/** Intra-block slicing (Case #1) --- 
-			 * Given MV/SV used variable, determine whether defined variables
-			 * are MV or SV.  
-			 */
-			
-			IASTNode content = block.getContent();
-			ExprMVAnalyzer emva = new ExprMVAnalyzer(content, mv, block);
-			emva.run();
-			newMV = Util.Union(newMV, emva.getMVList());
-			
-			/** Intra-block slicing (Case #3) -- 
-			 *  any used only multi-valued variable is still multi-valued
-			 */
-			for(Iterator<String> i = mv.iterator(); i.hasNext();){
-				String v = i.next();
-				if(block.getUse().contains(v) && !block.getDef().contains(v)){
-					if(!newMV.contains(v))
-						newMV.add(v);
-				}
-			}
-			
-			handlePointers(block, newMV);
-			handleBroadCast(block, newMV);
-			block.setMVvar(newMV);
-			
-			/** Inter-block slicing based on data dependences */
-			for(Iterator<String> i = newMV.iterator(); i.hasNext();){
-				String MVvar = i.next();
-				List<IBlock> DUnext = DUSucc.get(MVvar);
-				if(DUnext != null){
-					for(Iterator<IBlock> ii = DUnext.iterator(); ii.hasNext();){
-						MPIBlock b = (MPIBlock)ii.next();
-						if(b.sliced == true) continue;
-						if(!seeds.contains(b)){
-							seeds.add(b);
-							//System.out.println("block " + b.getID() + " is added to seeds");
-						}
-						if(!b.getMVvar().contains(MVvar))
-							b.getMVvar().add(MVvar);
-					}
-				}
-			}
-			
-			/** Inter-block slicing based on \Phi edges */
-			for(Iterator<IBlock> i = block.getJoin().iterator(); i.hasNext();){
-				MPIBlock join = (MPIBlock)i.next();
-				if(!seeds.contains(join) && !join.sliced) 
-					seeds.add(join);
-			}
-		}
-		
-		List<String> MVlist = currentNode_.getMVSummary().get(var);
-		for(Iterator<String> i = currentNode_.getGlobalDef().iterator(); i.hasNext();){
-			String v = i.next();
-			if(((MPIBlock)cfg.getExit()).getMVvar().contains(v)){
-				if(!MVlist.contains(v)) MVlist.add(v);
-			}
-		}
-		for(Iterator<String> i = currentNode_.getParamDef().iterator(); i.hasNext();){
-			String v = (String)i.next();
-			if(((MPIBlock)cfg.getExit()).getMVvar().contains(v)){
-				if(!MVlist.contains(v)) MVlist.add(v);
-			}
-		}
-		
-
-		if(returnMV())
-			if(!MVlist.contains(currentNode_.getFuncName()))
-				MVlist.add(currentNode_.getFuncName());
-	}
-
-	/** The return value of a function is multi-valued if any of its 
-	 * return statement is multi-valued.
-	 */
-	private boolean returnMV(){
-		boolean returnmv = false;
-		for(Iterator<IBlock> i = ((MPIControlFlowGraph)currentNode_.getCFG()).getReturnBlocks().iterator(); 
-			i.hasNext();){
-			MPIBlock returnBlock = (MPIBlock)i.next();
-			ExprMVAnalyzer ema = new ExprMVAnalyzer(returnBlock.getContent(), 
-												returnBlock.getMVvar(), returnBlock);
-			ema.run();
-			returnmv = returnmv | ema.isMV();
-			returnBlock.setMV(false); //reset it
-		}
-		return returnmv;
-	}
-
-	
-	private void handlePointers(MPIBlock block, List<String> set){
-		PointerAnalyzer pa = new PointerAnalyzer(block);
-		pa.run();
-		for(Iterator<String> i = pa.getAddr().iterator(); i.hasNext();){
-			String var = i.next();
-			if(block.getUse().contains(var)){
-				if(!set.contains(var)) set.add(var);
-			}
-		}
-		for(Iterator<String> i = pa.getDeref().iterator(); i.hasNext();){
-			String var = i.next();
-			if(block.getUse().contains(var)){
-				if(!set.contains(var)) set.add(var);
-			}
-		}
-	}
-	
-	private void handleBroadCast(MPIBlock block, List<String> set){
-		BroadCastAnalyzer bca = new BroadCastAnalyzer(block);
-		bca.run();
-		String bcdata = bca.getBCdata();
-		if(bcdata != null){
-			if(set.contains(bcdata))
-				set.remove(bcdata);
-		}
-		block.setMVvar(set);
-	}
-	
-	
-	private void clean(){
-		for(IBlock b = currentNode_.getCFG().getEntry(); b != null; b = b.topNext()){
-			MPIBlock block = (MPIBlock)b;
-			block.sliced = false;
-			block.setMVvar(new ArrayList<String>());
-		}
-	}
-	
-	/**
-	 * Expression Multi-valued Analyzer
-	 *
-	 */
-	class ExprMVAnalyzer{
-		private IASTStatement stmt_;
-		private IASTExpression expr_;
-		private List<String> context_;
-		private MPIBlock currentBlock_;
-
-		private List<String> MVvar_;
-		private Stack<boolean[]> exprListMVContext_;
-		
-		private boolean value;
-	
-		public ExprMVAnalyzer(IASTStatement stmt, List<String> context, MPIBlock block){
-			stmt_ = stmt;
-			expr_ = null;
-			context_ = context;
-			currentBlock_ = block;
-			MVvar_ = new ArrayList<String>();
-			exprListMVContext_ = new Stack<boolean[]>();
-			value = false;
-		}
-	
-		public ExprMVAnalyzer(IASTExpression expr, List<String> context, MPIBlock block){
-			stmt_ = null;
-			expr_ = expr;
-			context_ = context;
-			currentBlock_ = block;
-			MVvar_ = new ArrayList<String>();
-			exprListMVContext_ = new Stack<boolean[]>();
-			value = false;
-		}
-		
-		public ExprMVAnalyzer(IASTNode node, List<String> context, MPIBlock block){//BRT this one is called
-			if(node instanceof IASTExpression){
-				stmt_ = null;
-				expr_ = (IASTExpression)node;
-			} 
-			else if(node instanceof IASTStatement){
-				stmt_ = (IASTStatement)node;
-				expr_ = null;
-			}
-			context_ = context;
-			currentBlock_ = block;
-			MVvar_ = new ArrayList<String>();
-			exprListMVContext_ = new Stack<boolean[]>();
-			value = false;
-		}
-		
-		public void run(){
-			if(stmt_ != null){
-				value = useDefMVMapping(stmt_);
-			}
-			else if(expr_ != null){
-				List<String> defset = new ArrayList<String>();
-				value = useDefMVMapping(expr_, rhs, null, defset);
-			}
-		}
-		
-		public boolean isMV(){return value;}
-		public List<String> getMVList() {return MVvar_;}
-		
-		/** Returns true if statement is multi_valued.
-		 */
-		private boolean useDefMVMapping(IASTStatement stmt){
-			if(stmt instanceof IASTDeclarationStatement){
-				boolean value = false;
-				IASTDeclarationStatement declStmt = (IASTDeclarationStatement)stmt;
-				IASTDeclaration decl = declStmt.getDeclaration();
-				if(decl instanceof IASTSimpleDeclaration){
-					IASTSimpleDeclaration simpleDecl = (IASTSimpleDeclaration)decl;
-					IASTDeclarator[] declarators = simpleDecl.getDeclarators();
-					for(int i=0; i<declarators.length; i++){
-						boolean v1 = false;
-						IASTInitializer init = declarators[i].getInitializer();
-						if(init != null){
-							IASTName name = declarators[i].getName();
-							v1 = handleInitializer(init);
-							if(v1){
-								if(!MVvar_.contains(name.toString()))
-									MVvar_.add(name.toString());
-							}
-						}
-						value = value | v1;
-					}
-				}
-				return value;
-			}
-			else if(stmt instanceof IASTExpressionStatement){
-				IASTExpressionStatement exprS = (IASTExpressionStatement)stmt;
-				IASTExpression expr = exprS.getExpression();
-				List<String> mvlist = new ArrayList<String>();
-				value = useDefMVMapping(expr, rhs, null, mvlist);
-			}
-			return false;
-		}
-		
-		/**
-		 * Returns true if multi-valued?   //BRT
-		 * @param init
-		 * @return
-		 */
-		//BRT make sure this gets called, but will it be with these args?
-		///		not in a tree walk; perhaps with args gleaned from fn call
-		private boolean handleInitializer(IASTInitializer init){
-			if(init instanceof IASTInitializerExpression){
-				IASTInitializerExpression initE = (IASTInitializerExpression)init;
-				IASTExpression expr = initE.getExpression();
-				List<String> mvlist = new ArrayList<String>();
-				return useDefMVMapping(expr, rhs, null, mvlist);
-			}
-			else if(init instanceof IASTInitializerList){//BRT
-				IASTInitializerList initList = (IASTInitializerList)init;
-				IASTInitializer[] list = initList.getInitializers();
-				boolean listvalue = false;
-				for(int i=0; i<list.length; i++){
-					listvalue = listvalue | handleInitializer(list[i]);
-				}
-				return listvalue;
-			}
-			return false;
-		}
-		
-		
-		/** Return true if "expr" is multi_valued.
-		 *  
-		 * @param expr  expression to determine if multi-valued
-		 * @param side  LHS or RHS
-		 * @param func
-		 * @param set contains all defined variables in "expr" through assignment
-		 */
-		private boolean useDefMVMapping(IASTExpression expr, int side, 
-				IASTFunctionCallExpression func, List<String> set){
-			boolean v1 = false, v2 = false, v3 = false;
-			List<String> l1 = new ArrayList<String>(); 
-			List<String> l2 = new ArrayList<String>();
-			List<String> l3 = new ArrayList<String>();
-			if(expr == null) return false; 
-			if(expr instanceof IASTAmbiguousExpression){
-			}
-			else if(expr instanceof IASTArraySubscriptExpression){
-				IASTArraySubscriptExpression asE = (IASTArraySubscriptExpression)expr;
-				if(side == rhs){
-					// = a[index_expr]
-					v1 = useDefMVMapping(asE.getArrayExpression(), rhs, func, l1); 
-					v2 = useDefMVMapping(asE.getSubscriptExpression(), rhs, func, l2);
-				} else { //lhs
-					// a[b[i]] = ... , a is defined, b and i are used
-					v1 = useDefMVMapping(asE.getSubscriptExpression(), rhs, func, l1);
-					v2 = useDefMVMapping(asE.getArrayExpression(), lhs, func, l2);
-				}
-				Util.addAll(set, l1);
-				Util.addAll(set, l2);
-				return v1 | v2;
-			}
-			else if(expr instanceof IASTBinaryExpression){
-				IASTBinaryExpression biE = (IASTBinaryExpression)expr;
-				int op = biE.getOperator();
-				if(op == IASTBinaryExpression.op_assign){
-					// x = y = z is right associative --> x = (y = z)
-					// So the "side" will be always rhs
-					v1 = useDefMVMapping(biE.getOperand1(), lhs, func, l1);
-					v2 = useDefMVMapping(biE.getOperand2(), rhs, func, l2);
-					if(v2){
-						Util.addAll(MVvar_, l1);
-					}
-					Util.addAll(set, l1);
-					Util.addAll(set, l2);
-				}
-				else if( op == IASTBinaryExpression.op_multiplyAssign ||
-						 op == IASTBinaryExpression.op_divideAssign ||
-						 op == IASTBinaryExpression.op_moduloAssign ||
-						 op == IASTBinaryExpression.op_plusAssign ||
-						 op == IASTBinaryExpression.op_minusAssign ||
-						 op == IASTBinaryExpression.op_shiftLeftAssign ||
-						 op == IASTBinaryExpression.op_shiftRightAssign ||
-						 op == IASTBinaryExpression.op_binaryAndAssign ||
-						 op == IASTBinaryExpression.op_binaryXorAssign ||
-						 op == IASTBinaryExpression.op_binaryOrAssign){
-					v1 = useDefMVMapping(biE.getOperand1(), rhs, func, l1);
-					v2 = useDefMVMapping(biE.getOperand2(), rhs, func, l2);
-					v3 = useDefMVMapping(biE.getOperand1(), lhs, func, l3);
-					if(v1 | v2){
-						Util.addAll(MVvar_, l3);
-					}
-					Util.addAll(set, l1);
-					Util.addAll(set, l2);
-					Util.addAll(set, l3);
-				} 
-				else {
-					v1 = useDefMVMapping(biE.getOperand1(), rhs, func, l1);// BRT results are diff from 3.0!
-					v2 = useDefMVMapping(biE.getOperand2(), rhs, func, l2);
-					Util.addAll(set, l1);
-					Util.addAll(set, l2);
-				}
-				return v1 | v2 | v3;
-			}
-			else if(expr instanceof IASTCastExpression){
-				IASTCastExpression castE = (IASTCastExpression)expr;
-				v1 = useDefMVMapping(castE.getOperand(), side, func, l1);
-				Util.addAll(set, l1);
-				return v1;
-			}
-			else if(expr instanceof IASTConditionalExpression){
-				IASTConditionalExpression condE = (IASTConditionalExpression)expr;
-				if(side == rhs){
-					v1 = useDefMVMapping(condE.getLogicalConditionExpression(), rhs, func, l1); 
-					v2 = useDefMVMapping(condE.getPositiveResultExpression(), rhs, func, l2); 
-					v3 = useDefMVMapping(condE.getNegativeResultExpression(), rhs, func, l3);
-				} else {
-					// eg. (x > y ? x : y) = 1
-					v1 = useDefMVMapping(condE.getLogicalConditionExpression(), rhs, func, l1); 
-					v2 = useDefMVMapping(condE.getPositiveResultExpression(), lhs, func, l2); 
-					v3 = useDefMVMapping(condE.getNegativeResultExpression(), lhs, func, l3);
-				}
-				Util.addAll(set, l1);
-				Util.addAll(set, l2);
-				Util.addAll(set, l3);
-				return v1 | v2 | v3;
-			}
-			else if(expr instanceof IASTExpressionList){// BRT IASTExpressionList no longer in AST; see below
-				IASTExpressionList exprList = (IASTExpressionList)expr;//But this *DOES* get called. 3-deep recursive call of useDevMVMapping
-				IASTExpression[] exprs = exprList.getExpressions();
-				boolean[] newContext_ = new boolean[exprs.length];
-				for(int i = 0; i<exprs.length; i++){
-					v1 = v1 | useDefMVMapping(exprs[i], side, func, l1);
-					newContext_[i] = v1;
-					Util.addAll(set, l1);
-				}
-				if(func != null) 
-					exprListMVContext_.push(newContext_);//BRT note this is NOT a field! local var only
-				return v1;
-			}
-			else if(expr instanceof IASTFieldReference){
-				IASTFieldReference frE = (IASTFieldReference)expr;
-				v1 = useDefMVMapping(frE.getFieldOwner(), side, func, l1);
-				Util.addAll(set, l1);
-				return v1;
-			}
-			else if(expr instanceof IASTFunctionCallExpression){
-				IASTFunctionCallExpression funcE = (IASTFunctionCallExpression)expr;
-				IASTExpression funcname = funcE.getFunctionNameExpression();
-				String signature = funcname.getRawSignature();				
-				IASTExpression parameter = funcE.getParameterExpression();// BRT this might still work!!
-				// BRT try to replace above deprecated fn with:
-				IASTInitializerClause[] newParameterList=funcE.getArguments();
-				MPICallGraphNode cgNode = (MPICallGraphNode)cg_.getNode(currentNode_.getFileName(), signature);
-				if(cgNode != null){ // BRT always null on tiny.c.  ??
-					/* 1. Determine whether each parameter is MV or SV
-					 * 2. Refer to the MVsummary, find the set of MV variables 
-					 * according to the parameter MV context, and find out 
-					 * whether the return value is MV or SV
-					 */
-					boolean returnval = false;
-					if(parameter != null){
-						v1 = useDefMVMapping(parameter, side, funcE, l1);
-						// BRT note with CDT 7.0 the IASTExpressionList is not encountered in the AST
-						// See bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=306064
-						// But since we get it from a method call 
-						// IASTFunctionCallExpression.getParameterExpression()  this probably still
-						// works ok here.
-						returnval=oldParameterUse(parameter, cgNode, returnval);
-
-						// == end context old way
-						
-						//=== new way
-						//returnval = newParameterUse(side, set, v1, l1, funcE, newParameterList, cgNode, returnval);
-						//=== end new way		   
-					}
-					for(Iterator<String> i = cgNode.getGlobalUse().iterator(); i.hasNext();){
-						String guse = i.next();
-						if(context_.contains(guse)){
-							List<String> mvlist = cgNode.getMVSummary().get(guse);
-							Util.addAll(MVvar_, mvlist);
-							if(mvlist.contains(cgNode.getFuncName())){ //return MV value
-								MVvar_.remove(cgNode.getFuncName());
-								returnval = true;
-							}
-						}
-					}
-					if(cgNode.getMVSummary().size() == 1){//no parameter, no global use
-						List<String> mvlist = cgNode.getMVSummary().get(cgNode.getFuncName());
-						if(mvlist.size() == 1 && mvlist.contains(cgNode.getFuncName()))
-							returnval = true;
-						else
-							returnval = false;
-					}
-					return returnval;
-				}// end if cgNode!=null
-				else{ 
-					if(parameter != null){
-						v1 = useDefMVMapping(parameter, side, funcE, l1);
-						if(parameter instanceof IASTExpressionList)  
-							exprListMVContext_.pop();  
-						Util.addAll(set, l1);
-						return v1;
-					}
-					else 
-						return false;
-				}
-			}
-			else if(expr instanceof IASTIdExpression){
-				IASTIdExpression id = (IASTIdExpression)expr;
-				IASTName name = id.getName();
-				String var = name.toString();
-				if(var.startsWith("MPI_")) return false; //$NON-NLS-1$
-				if(side == rhs){
-					if(func != null){ //function parameter
-						IASTExpression funcname = func.getFunctionNameExpression();
-						String signature = funcname.getRawSignature();
-						ICallGraphNode n = cg_.getNode(currentNode_.getFileName(), signature);
-						if(n == null) { //library function call
-							if(currentBlock_.getDef().contains(var)){
-								if(!set.contains(var)) set.add(var);
-								if(context_.contains(var) && !MVvar_.contains(var))
-									MVvar_.add(var);
-							}
-						}
-					}
-					if(context_.contains(var)) 
-						return true;
-				} else { //lhs
-					if(!set.contains(var))
-						set.add(var);
-					return false;
-				}
-			}
-			else if(expr instanceof IASTLiteralExpression){
-			}
-			else if(expr instanceof IASTProblemExpression){
-			}
-			else if(expr instanceof IASTTypeIdExpression){
-			}
-			else if(expr instanceof IASTUnaryExpression){
-				IASTUnaryExpression uE = (IASTUnaryExpression)expr;
-				int op = uE.getOperator();
-				if(op == IASTUnaryExpression.op_prefixIncr ||
-					  op == IASTUnaryExpression.op_prefixDecr ||
-					  op == IASTUnaryExpression.op_postFixIncr ||
-					  op == IASTUnaryExpression.op_postFixDecr) {
-					v1 = useDefMVMapping(uE.getOperand(), rhs, func, l1);
-					v2 = useDefMVMapping(uE.getOperand(), lhs, func, l2);
-					if(v1){
-						Util.addAll(MVvar_, l2);
-					}
-					Util.addAll(set, l1);
-					Util.addAll(set, l2);
-				} else {
-					v1 = useDefMVMapping(uE.getOperand(), side, func, l1);
-					Util.addAll(set, l1);
-				}
-				return v1 | v2;
-			}
-			else if(expr instanceof ICASTTypeIdInitializerExpression){
-			}
-			else{
-			}
-			return false;
-		}
-
-		/**
-		 * @param side
-		 * @param set
-		 * @param v1
-		 * @param l1
-		 * @param funcE
-		 * @param newParameterList
-		 * @param n
-		 * @param returnval
-		 * @return
-		 */
-		private boolean newParameterUse(int side, List<String> set, boolean v1, List<String> l1,
-				IASTFunctionCallExpression funcE, IASTInitializerClause[] newParameterList, MPICallGraphNode n,
-				boolean returnval) {
-			if(newParameterList!=null) {
-				
-				//boolean[] newContext = new boolean[parameter2.length];
-				boolean context;
-				for (int i = 0; i < newParameterList.length; i++) {
-					IASTInitializerClause ic = newParameterList[i];
-					if(ic instanceof IASTExpression) { // BRT?? is it??
-						String rawSig=ic.getRawSignature();// for debug purposes
-						IASTExpression iexpr=(IASTExpression)ic;
-						v1=v1|useDefMVMapping(iexpr, side, funcE, l1);
-						context=v1;
-						Util.addAll(set,l1);  // BRT ?????
-						
-						//--- put this inside this loop, don't need another loop
-						if(context){
-							String param = getFormalParamName(n, i);
-							if(param != null){
-								List<String> mvlist = n.getMVSummary().get(param);
-								Util.addAll(MVvar_, mvlist);
-								if(mvlist.contains(n.getFuncName())){ //return MV value
-									MVvar_.remove(n.getFuncName());
-									returnval = true;
-								}
-							}
-						}
-						//---
-					}
-					//omit exprListMVContext_.push(newContext);
-				}
-
-			}
-			return returnval;
-		}
-
-		/**
-		 * @param parameter
-		 * @param cgNode
-		 * @param returnval
-		 * @return
-		 */
-		private boolean oldParameterUse(IASTExpression parameter, MPICallGraphNode cgNode, boolean returnval) {
-			if(parameter instanceof IASTExpressionList){ // >1 parameter   
-				boolean[] paramContext = (boolean[])exprListMVContext_.pop();
-				for(int i=0; i<paramContext.length; i++){
-					if(paramContext[i]){
-						String param = getFormalParamName(cgNode, i);
-						if(param != null){
-							List<String> mvlist = cgNode.getMVSummary().get(param);
-							Util.addAll(MVvar_, mvlist);
-							if(mvlist.contains(cgNode.getFuncName())){ //return MV value
-								MVvar_.remove(cgNode.getFuncName());
-								returnval = true;
-							}
-						}
-					}
-				}
-			} else { // single parameter
-				String param = getFormalParamName(cgNode, 0);
-				if(param != null){
-					List<String> mvlist = cgNode.getMVSummary().get(param);
-					Util.addAll(MVvar_, mvlist);
-					if(mvlist.contains(cgNode.getFuncName())){ //return MV value
-						MVvar_.remove(cgNode.getFuncName());
-						returnval = true;
-					}
-				}
-			}
-			return returnval;
-		}
-	}
-	
-	private String getFormalParamName(ICallGraphNode func, int index){
-		IASTFunctionDefinition fd = func.getFuncDef();
-		IASTFunctionDeclarator fdecl = fd.getDeclarator();
-		if(fdecl instanceof IASTStandardFunctionDeclarator){
-			IASTStandardFunctionDeclarator sfunc = (IASTStandardFunctionDeclarator)fdecl;
-			IASTParameterDeclaration[] params = sfunc.getParameters();
-			if(index >= params.length) // additional parameters
-				return null;
-			IASTName param = params[index].getDeclarator().getName();
-			return param.toString();
-		} else {
-			ICASTKnRFunctionDeclarator krfunc = (ICASTKnRFunctionDeclarator)fdecl;
-			IASTName[] params = krfunc.getParameterNames();
-			if(index >= params.length)
-				return null;
-			return params[index].toString();
-		}
-	}
-	
-	/** Determines a set of multi-valued "VARIABLES" (local and global) 
-	 * in each program point 
-	 */
-	private void functionSlicing(){
-		for(ICallGraphNode n = cg_.topEntry(); n != null; n = n.topNext()){
-			MPICallGraphNode node = (MPICallGraphNode)n;
-			if(!node.marked) continue;
-			currentNode_ = node;
-			//System.out.println(node.getFuncName());
-			IControlFlowGraph cfg = node.getCFG();
-			
-			/** The initial worklist contains seeds blocks in this function and 
-			 * the entry block if any of its parameters is multi-valued. 
-			 */
-			WorkListCollector wlc = new WorkListCollector(currentNode_);
-			LinkedList<IBlock> seeds = wlc.getWorkList();
-			boolean hasMVparam = false;
-			for(Enumeration<String> e = node.getParamMV().keys(); e.hasMoreElements();){
-				String param = e.nextElement();
-				boolean val = node.getParamMV().get(param).booleanValue();
-				if(val){ // multi-valued parameter
-					((MPIBlock)cfg.getEntry()).getMVvar().add(param);
-					hasMVparam = true;
-				}
-			}
-			if(hasMVparam) seeds.add(cfg.getEntry());
-			
-			/** Slicing */
-			while(!seeds.isEmpty()){
-				MPIBlock block = (MPIBlock)seeds.remove();
-				if(block.sliced) continue;
-				block.sliced = true;
-
-				//System.out.println("current seed is " + block.getID());
-				Hashtable<String,List<IBlock>> DUSucc = block.getDUSucc();
-				List<String> mv = block.getMVvar();
-				List<String> newMV = new ArrayList<String>();
-				
-				handlePointers(block, mv);
-
-				/* Intra-block slicing (Case #1) ---
-				 * If there is a \phi function in this block, consider two cases:
-				 * (1) If this block is a join block for If statement or Switch
-				 * statement, or if this block is break exit join block of a loop,
-				 * then all \phi variables in this block are multi-valued;
-				 * (2) If this block is a join block (i.e., cond block) for For 
-				 * statement, While statement or Do statement, then its multi-valued 
-				 * \phi variables have been already marked through data dependences, 
-				 * and all used \phi variables are kept multi-valued.
-				 * Note: a block falls into one and only one of these two cases.
-				 */
-				if(!block.getPhiVar().isEmpty()){
-					List<IBlock> cond = block.getCond();
-					int blockcase = 0;
-					for(Iterator<IBlock> i = cond.iterator(); i.hasNext();){
-						if(blockcase == 2) break;
-						MPIBlock condblock = (MPIBlock)i.next();
-						IASTStatement parent = condblock.getParent();
-						if(parent instanceof IASTIfStatement || 
-								parent instanceof IASTSwitchStatement)
-							blockcase = 1;
-						else if(parent instanceof IASTForStatement ||
-								parent instanceof IASTDoStatement ||
-								parent instanceof IASTWhileStatement){
-							if(block.getType() == MPIBlock.exit_join_type)
-								blockcase = 1;
-							else if(block.getType() == MPIBlock.expr_type)
-								blockcase = 2;
-						}
-					}
-					if(blockcase == 1){
-						newMV = Util.Union(newMV, block.getPhiVar());
-					}
-					else if(blockcase == 2){
-						for(Iterator<IBlock> i = cond.iterator(); i.hasNext();){
-							MPIBlock condblock = (MPIBlock)i.next();
-							for(Iterator<String> ii = condblock.getUsedPhiVar().iterator();
-									ii.hasNext();){
-								String var = ii.next();
-								if(mv.contains(var))
-									newMV.add(var);
-							}
-						}
-					}
-				}	
-				
-				/** Intra-block slicing (Case #1) --- 
-				 * Given MV/SV used variable, determine whether defined variables
-				 * are MV or SV.  
-				 */
-				
-				IASTNode content = block.getContent();
-				ExprMVAnalyzer emva = new ExprMVAnalyzer(content, mv, block);
-				emva.run();
-				newMV = Util.Union(newMV, emva.getMVList());
-				
-				/** Intra-block slicing (Case #3) -- 
-				 *  any used only multi-valued variable is still multi-valued
-				 */
-				for(Iterator<String> i = mv.iterator(); i.hasNext();){
-					String var = i.next();
-					if(block.getUse().contains(var) && !block.getDef().contains(var)){
-						if(!newMV.contains(var))
-							newMV.add(var);
-					}
-				}
-				
-				handlePointers(block, newMV);
-				handleBroadCast(block, newMV);
-				block.setMVvar(newMV);
-				
-				/** Inter-block slicing based on data dependences */
-				for(Iterator<String> i = newMV.iterator(); i.hasNext();){
-					String MVvar = i.next();
-					List<IBlock> DUnext = DUSucc.get(MVvar);
-					if(DUnext != null){
-						for(Iterator<IBlock> ii = DUnext.iterator(); ii.hasNext();){
-							MPIBlock b = (MPIBlock)ii.next();
-							if(b.sliced == true) continue;
-							if(!seeds.contains(b)){
-								seeds.add(b);
-								//System.out.println("block " + b.getID() + " is added to seeds");
-							}
-							if(!b.getMVvar().contains(MVvar))
-								b.getMVvar().add(MVvar);
-						}
-					}
-				}
-				
-				/** Inter-block slicing based on \Phi edges */
-				for(Iterator<IBlock> i = block.getJoin().iterator(); i.hasNext();){
-					MPIBlock join = (MPIBlock)i.next();
-					if(!seeds.contains(join) && !join.sliced) 
-						seeds.add(join);
-				}
-			}
-			
-			/* Function Multi-valued Summary --- (1) whether a function's REAL
-			 * parameters are multi-valued (A real parameter of function foo is 
-			 * multi-valued if in any of foo's call sites the parameter is 
-			 * multi-valued)
-			 */
-			for(IBlock block = cfg.getEntry(); block != null; block = block.topNext()){
-				FuncParamMVChecker fpc = new FuncParamMVChecker(node, (MPIBlock)block);
-				fpc.run();
-			}
-		}
-	}
-	
-	class SeedsCollector extends ASTVisitor{	
-		private MPICallGraphNode currentFunc_;
-		
-		public void run(){
-			this.shouldVisitExpressions = true;
-			this.shouldVisitStatements = true;
-			
-			for(ICallGraphNode n = cg_.botEntry(); n != null; n = n.botNext()){
-				MPICallGraphNode node = (MPICallGraphNode)n;
-				if(!node.marked) continue;
-				currentFunc_ = node;
-				IControlFlowGraph cfg = node.getCFG();
-				for(IBlock b = cfg.getEntry(); b != null; b = b.topNext()){
-					IASTNode content = b.getContent();
-					if(content != null) 
-						content.accept(this);
-				}
-			}
-			for(ICallGraphNode n = cg_.botEntry(); n != null; n = n.botNext()){
-				MPICallGraphNode node = (MPICallGraphNode)n;
-				if(!node.marked) continue;
-				if(node.hasSeed()){
-					for(Iterator<ICallGraphNode> i = node.getCallers().iterator(); i.hasNext();){
-						MPICallGraphNode caller = (MPICallGraphNode)i.next();
-						caller.setSeed(true);
-					}
-				}
-			}
-		}
-	
-		public int visit(IASTExpression expr){
-			if(expr instanceof IASTFunctionCallExpression){
-				IASTFunctionCallExpression funcExpr = (IASTFunctionCallExpression)expr;
-				IASTExpression funcname = funcExpr.getFunctionNameExpression();
-				String signature = funcname.getRawSignature();
-				if(signature.equals("MPI_Comm_rank")){ //$NON-NLS-1$
-					currentFunc_.setSeed(true);
-				} 
-			}
-			return PROCESS_CONTINUE;
-		}
-	}
-	
-	
-	/** Work list contains two kinds of blocks:<br>
-	 * (1) where MPI_Comm_rank() is directly or indirectly called; <br>
-	 * (2) the entry block of a function that has some MV real parameters;
-	 * <p>
-	 * (1) is marked in SeedsCollector and collected in WorkListCollector <br>
-	 * (2) is collected in the slicing function. 
-	 */
-	class WorkListCollector extends ASTVisitor{	
-		private ICallGraphNode func_;
-		private boolean inRankFunc;
-		private IASTExpressionList paramsOLD;
-		private IASTInitializerClause[] params_;// BRT will perhaps replace IASTExpressionList
-		private LinkedList<IBlock> wlist;
-		private MPIBlock currentBlock_;
-		
-		public WorkListCollector(ICallGraphNode func){
-			func_ = func;
-			inRankFunc = false;
-			wlist = new LinkedList<IBlock>();
-		}
-		
-		public LinkedList<IBlock> getWorkList(){
-			if(!((MPICallGraphNode)func_).hasSeed())  return wlist;
-			
-			this.shouldVisitExpressions = true;
-			this.shouldVisitStatements = true;
-			for(IBlock b = func_.getCFG().getEntry(); b != null; b = b.topNext()){
-				currentBlock_ = (MPIBlock)b;
-				IASTNode content = b.getContent();
-				if(content != null) 
-					content.accept(this);
-			}
-			return wlist;
-		}
-	
-		//int visitDebugCount=0;
-		public int visit(IASTExpression expr){
-			//System.out.println("visitDebugCount="+visitDebugCount+" expr="+expr+" "+expr.getRawSignature());
-			//visitDebugCount++;
-			if(expr instanceof IASTFunctionCallExpression){
-				IASTFunctionCallExpression funcExpr = (IASTFunctionCallExpression)expr;
-				IASTExpression funcname = funcExpr.getFunctionNameExpression();
-				String signature = funcname.getRawSignature();
-				if(signature.equals("MPI_Comm_rank")){ //$NON-NLS-1$
-					inRankFunc = true;
-				} else {
-					MPICallGraphNode n = (MPICallGraphNode)cg_.getNode(currentNode_.getFileName(), signature);
-					if(n != null && n.hasSeed()){
-						if(!wlist.contains(currentBlock_))
-							wlist.add(currentBlock_);
-						List<String> genMV = n.getMVSummary().get(signature);
-						Util.addAll(currentBlock_.getMVvar(), genMV);
-						if(currentBlock_.getMVvar().contains(n.getFuncName()))
-							currentBlock_.getMVvar().remove(n.getFuncName());
-					}
-				}
-				if (inRankFunc) {
-					// BRT do what was formerly done when we hit an
-					// IASTExpressionList node.
-					IASTInitializerClause[] initClause = funcExpr.getArguments();
-					params_ = initClause;
-				}
-				
-			} else if(expr instanceof IASTIdExpression){ // BRT NOTE: most of changes (for CDT 7.0 change) are here
-				// BRT re: CDT 7.0 changes for barrier matching bug: still not working perfectly yet
-				//IASTIdExpression id2 = (IASTIdExpression)expr;
-				//String var2 = id2.getName().toString();
-				String var2=((IASTIdExpression) expr).getName().toString();
-				// BRT debug cond bkpt here: var2.equals("my_rank")
-				if(inRankFunc){
-					IASTNode me = expr;
-					IASTNode parent = me.getParent();
-					while(true){
-						//if(parent == params) break; // BRT ptp40: params is null. not in ptp30; there is no longer an ASTnode for the parameters
-						//else 
-							if(parent instanceof IASTFunctionCallExpression) break;
-						else{
-							if(traceOn)System.out.println("MMVA: me=parent, parent=parent.getParent()"); //$NON-NLS-1$
-							me = parent;
-							parent = parent.getParent();
-						}
-					}
-					String meSig=me.getRawSignature();
-					boolean temp=false;// BRT never encountered now?
-					if(temp&&!(parent instanceof IASTExpressionList /* new: || parent instanceof IASTFunctionCallExpression*/))// BRT false in PTP 4.0   - is CASTFunctionCallExpression now
-						return PROCESS_CONTINUE;
-					//IASTExpression[] rankParams = params.getExpressions();
-
-					if(params_!=null) {
-					IASTInitializerClause cl = params_[0];
-					if(cl instanceof IASTIdExpression) {
-						System.out.println("IASTInitializerClause is IASTIdExpression"); //$NON-NLS-1$
-					}
-					}
-					
-					
-					int index;
-					for(index=0; index<params_.length; index++){
-						//if(me == rankParams[index]) break;
-						if(me == params_[index])break;
-					}
-					// BRT The second arg of MPI_Comm_rank is the variable that is thus multi-valued.
-					if(index == 1){
-						IASTIdExpression id = (IASTIdExpression)expr;
-						String var = id.getName().toString();
-						//if(var.equals("MPI_Comm_rank")) return PROCESS_CONTINUE;
-						// BRT Add this variable to the list of multivalued variables in the current block, if not already there
-						if(!currentBlock_.getMVvar().contains(var))
-							currentBlock_.getMVvar().add(var);
-						if(!wlist.contains(currentBlock_)) wlist.add(currentBlock_);
-					}
-				}
-			} else if(expr instanceof IASTExpressionList){
-				if(inRankFunc){
-					paramsOLD = (IASTExpressionList)expr;// BRT investigate if ptp40 gets here
-				}
-			}
-			return PROCESS_CONTINUE;
-		}
-		
-		public int leave(IASTExpression expr){
-			if(expr instanceof IASTFunctionCallExpression){
-				IASTFunctionCallExpression funcExpr = (IASTFunctionCallExpression)expr;
-				IASTExpression funcname = funcExpr.getFunctionNameExpression();
-				String signature = funcname.getRawSignature();
-				if(signature.equals("MPI_Comm_rank")){ //$NON-NLS-1$
-					inRankFunc = false;
-				}
-				params_=null; // BRT ???? do we do this here since no more IASTExpressionList below?
-				paramsOLD=null;
-				// BRT do we need to do paramsOLD=null instead?
-				// BRTnext IASTFunctionCallExpr is one level higher in the AST than the old IASTExpressionList was
-
-			}
-			else if(expr instanceof IASTExpressionList){
-				paramsOLD = null;// BRT will never reach here, IASTExpressionLlist no longer in AST tree
-			}
-			return PROCESS_CONTINUE;
-		}
-	}
-	
-	class BroadCastAnalyzer extends ASTVisitor{
-		private IBlock block_;
-		private String var;
-		
-		public BroadCastAnalyzer(IBlock block){
-			block_ = block;
-			var = null;
-		}
-		public String getBCdata() {return var;}
-		
-		public void run(){
-			this.shouldVisitStatements = true;
-			this.shouldVisitExpressions = true;
-			IASTNode content = block_.getContent();
-			if(content != null) 
-				content.accept(this);
-		}
-		
-		public int visit(IASTExpression expr){
-			if(expr instanceof IASTFunctionCallExpression){
-				IASTFunctionCallExpression funcE = (IASTFunctionCallExpression)expr;
-				IASTExpression funcname = funcE.getFunctionNameExpression();
-				String signature = funcname.getRawSignature();
-				if(signature.equals("MPI_Bcast")){ //$NON-NLS-1$
-					IASTExpression paramE = funcE.getParameterExpression();
-					IASTExpression[] params = ((IASTExpressionList)paramE).getExpressions();
-					IASTExpression dataE = params[0];
-					if(dataE instanceof IASTIdExpression){
-						IASTIdExpression ID = (IASTIdExpression)dataE;
-						var = ID.getName().toString();
-					}
-					else if(dataE instanceof IASTUnaryExpression){
-						IASTUnaryExpression uE = (IASTUnaryExpression)dataE;
-						if(uE.getOperator() == IASTUnaryExpression.op_amper &&
-								uE.getOperand() instanceof IASTIdExpression){
-							IASTIdExpression ID = (IASTIdExpression)uE.getOperand();
-							var = ID.getName().toString();
-						}
-					}
-				}
-				return PROCESS_SKIP;
-			}
-			return PROCESS_CONTINUE;
-		}
-
-	}
-	
-	class PointerAnalyzer extends ASTVisitor{
-		protected IBlock block_;
-		protected List<String> deref_;
-		protected List<String> addr_;
-		
-		public PointerAnalyzer(IBlock b){
-			block_ = b;
-			deref_ = new ArrayList<String>();
-			addr_ = new ArrayList<String>();
-		}
-		
-		public List<String> getDeref() {return deref_;}
-		public List<String> getAddr() {return addr_;}
-		
-		public void run(){
-			this.shouldVisitExpressions = true;
-			this.shouldVisitStatements = true;
-			IASTNode content = block_.getContent();
-			if(content != null) 
-				content.accept(this);
-		}
-		
-		public int visit(IASTExpression expr){
-			visitor(expr, false, false);
-			return PROCESS_SKIP;
-		}
-		
-		private void visitor(IASTExpression expr, boolean inDeref, boolean inAddr){
-			if(expr instanceof IASTArraySubscriptExpression){
-				IASTArraySubscriptExpression arrayE = (IASTArraySubscriptExpression)expr;
-				visitor(arrayE.getArrayExpression(), inDeref, inAddr);
-				visitor(arrayE.getSubscriptExpression(), false, false);
-			}
-			else if(expr instanceof IASTBinaryExpression){
-				IASTBinaryExpression biE = (IASTBinaryExpression)expr;
-				visitor(biE.getOperand1(), inDeref, inAddr);
-				visitor(biE.getOperand2(), inDeref, inAddr);
-			}
-			else if(expr instanceof IASTConditionalExpression){
-				IASTConditionalExpression condE = (IASTConditionalExpression)expr;
-				visitor(condE.getLogicalConditionExpression(), inDeref, inAddr);
-				visitor(condE.getPositiveResultExpression(), inDeref, inAddr);
-				visitor(condE.getNegativeResultExpression(), inDeref, inAddr);
-			}
-			else if(expr instanceof IASTExpressionList){
-				IASTExpressionList listE = (IASTExpressionList)expr;
-				IASTExpression[] exprs = listE.getExpressions();
-				for(int i=0; i<exprs.length; i++){
-					visitor(exprs[i], inDeref, inAddr);
-				}
-			}
-			else if(expr instanceof IASTFieldReference){
-				IASTFieldReference fr = (IASTFieldReference)expr;
-				visitor(fr.getFieldOwner(), inDeref, inAddr);
-			}
-			else if(expr instanceof IASTFunctionCallExpression){
-				IASTFunctionCallExpression funcE = (IASTFunctionCallExpression)expr;
-				IASTExpression funcname = funcE.getFunctionNameExpression();
-				String signature = funcname.getRawSignature();
-				ICallGraphNode n = cg_.getNode(currentNode_.getFileName(), signature);
-				if(n != null) return;
-				visitor(funcE.getFunctionNameExpression(), false, false);
-				visitor(funcE.getParameterExpression(), inDeref, inAddr);
-			}
-			else if(expr instanceof IASTIdExpression){
-				IASTIdExpression ID = (IASTIdExpression)expr;
-				String var = ID.getName().toString();
-				if(inDeref){
-					if(!deref_.contains(var)) 
-						deref_.add(var);
-				} 
-				if(inAddr){
-					if(!addr_.contains(var))
-						addr_.add(var);
-				}
-			}
-			else if(expr instanceof IASTUnaryExpression){
-				IASTUnaryExpression uE = (IASTUnaryExpression)expr;
-				int op = uE.getOperator();
-				boolean addrflag = inAddr;
-				boolean derefflag = inDeref;
-				if(op == IASTUnaryExpression.op_amper){ // &E
-					addrflag = true;
-				} else if(op == IASTUnaryExpression.op_star){ // *E
-					derefflag = true;
-				}
-				visitor(uE.getOperand(), addrflag, derefflag);
-			}
-		}
-	}
-	
-	class FuncParamMVChecker extends ASTVisitor{
-		protected MPICallGraphNode currentNode_;
-		protected MPIBlock block_;
-		protected MPICallGraphNode func;
-		
-		public FuncParamMVChecker(MPICallGraphNode func, MPIBlock block){
-			currentNode_ = func;
-			block_ = block;
-			func = null;
-		}
-		
-		public void run(){
-			this.shouldVisitExpressions = true;
-			this.shouldVisitStatements = true;
-			
-			IASTNode content = block_.getContent();
-			if(content != null) 
-				content.accept(this);
-		}
-	
-		public int visit(IASTExpression expr){
-			if(expr instanceof IASTFunctionCallExpression){
-				IASTFunctionCallExpression funcExpr = (IASTFunctionCallExpression)expr;
-				IASTExpression funcname = funcExpr.getFunctionNameExpression();
-				String signature = funcname.getRawSignature();
-				func = (MPICallGraphNode)cg_.getNode(currentNode_.getFileName(), signature);
-				if(func != null){
-					IASTExpression parameter = funcExpr.getParameterExpression();
-					if(parameter instanceof IASTExpressionList){
-						IASTExpressionList paramListE = (IASTExpressionList)parameter;
-						IASTExpression[] params = paramListE.getExpressions();
-						for(int i=0; i<params.length; i++){
-							ExprMVAnalyzer ema = new ExprMVAnalyzer(params[i], 
-									block_.getMVvar(), block_);
-							ema.run();
-							if(ema.isMV()){
-								String paramName = getFormalParamName(func, i);
-								if(paramName != null)
-									func.getParamMV().put(paramName, new Boolean(true));
-							}
-						}
-					}
-					else if(parameter != null){
-						ExprMVAnalyzer ema = new ExprMVAnalyzer(parameter, 
-								block_.getMVvar(), block_);
-						ema.run();
-						if(ema.isMV()){
-							String paramName = getFormalParamName(func, 0);
-							if(paramName != null)
-								func.getParamMV().put(paramName, new Boolean(true));
-						}
-					}
-				}
-			}
-			return PROCESS_CONTINUE;
-		}
-		
-		public int leave(IASTExpression expr){
-			if(expr instanceof IASTFunctionCallExpression){
-				IASTFunctionCallExpression funcExpr = (IASTFunctionCallExpression)expr;
-				IASTExpression funcname = funcExpr.getFunctionNameExpression();
-				String signature = funcname.getRawSignature();
-				if(cg_.getNode(currentNode_.getFileName(), signature) == func){
-					func = null;
-				}
-			}
-			return PROCESS_CONTINUE;
-		}
-	}
-	
-	/** Determine whether an "EXPRESSION" is multi-valued */
-	private void exprMVAnalysis(){
-		for(ICallGraphNode n = cg_.botEntry(); n != null; n = n.botNext()){
-			MPICallGraphNode node = (MPICallGraphNode)n;
-			if(!node.marked) continue;
-			IControlFlowGraph cfg = node.getCFG();
-			for(IBlock b = cfg.getEntry(); b != null; b = b.topNext()){
-				MPIBlock block = (MPIBlock)b;
-				//System.out.println("expMVAnalysis(): Block " + block.getID()); //$NON-NLS-1$
-				ExprMVAnalyzer EA = new ExprMVAnalyzer(block.getContent(), block.getMVvar(), block);
-				//                                                         ^^^ BRT isEmpty 
-				EA.run();
-				boolean mv=EA.isMV();
-				block.setMV(EA.isMV());
-				
-			}
-		}
-	}
-	
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIResourceCollector.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIResourceCollector.java
deleted file mode 100644
index 4f0b2ea..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPIResourceCollector.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.analysis.analysis;
-
-import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
-import org.eclipse.cdt.core.dom.ast.IASTPointerOperator;
-import org.eclipse.core.resources.IFile;
-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.impl.ResourceCollector;
-
-/**
- * Resource collection functions specific for MPI analysis
- * @author Yuan Zhang, Beth Tibbitts
- *
- */
-public class MPIResourceCollector extends ResourceCollector{
-
-	public MPIResourceCollector(ICallGraph cg, IFile file){
-		super(cg, file);
-	}
-	
-
-	/**
-	 * Create a specific kind of call graph node , the MPICallGraphNode
-	 * 
-	 * @return call graph node created
-	 */
-	protected ICallGraphNode addCallGraphNode(IFile file, String filename,
-			IASTFunctionDefinition fd) {
-		ICallGraphNode cgnode = new MPICallGraphNode(file, filename, fd);
-		return cgnode;
-	}
-	/** 
-	 * extra optional test that derived class can do
-	 */
-	protected boolean doQuickOptionalTest(String var){
-		boolean result = var.startsWith("MPI_") || var.startsWith("PMPI_") || //$NON-NLS-1$ //$NON-NLS-2$
-			var.startsWith("MPIO_") || var.startsWith("PMPIO_"); //$NON-NLS-1$ //$NON-NLS-2$
-		return result;
-	 }
-	 protected void doOtherDeclaratorStuff(IASTDeclarator declarator) {
-		IASTPointerOperator[] pops = declarator.getPointerOperators();
-		if (pops != IASTPointerOperator.EMPTY_ARRAY)
-			((MPICallGraph) CG_).getGVPointer().add(new Boolean(true));
-		else
-			((MPICallGraph) CG_).getGVPointer().add(new Boolean(false));
-
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPISSA.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPISSA.java
deleted file mode 100644
index 39e1ed1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPISSA.java
+++ /dev/null

@@ -1,190 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis.analysis;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTDoStatement;
-import org.eclipse.cdt.core.dom.ast.IASTForStatement;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.cdt.core.dom.ast.IASTWhileStatement;
-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.Block;
-
-public class MPISSA {
-	protected ICallGraph cg_;
-	protected MPICallGraphNode currentFunc_;
-	protected Hashtable<String,List<IBlock>> defTable_;
-	protected IControlFlowGraph cfg_;
-	
-	public MPISSA(ICallGraph cg){
-		cg_ = cg;
-	}
-	
-	public void run(){
-		for(ICallGraphNode n = cg_.botEntry(); n != null; n = n.botNext()){
-			MPICallGraphNode node = (MPICallGraphNode)n;
-			//System.out.println(node.getFuncName());
-			if(!node.marked) continue;
-			currentFunc_ = node;
-			cfg_ = node.getCFG();
-			defTable_ = node.getDefTable();
-			domFrontier();
-			placePHI();
-			ExitBlockPhi ebp = new ExitBlockPhi();
-			ebp.run();
-		}
-	}
-	
-	public void domFrontier(){
-		for(IBlock bx = cfg_.getEntry(); bx != null; bx = bx.topNext()){
-			MPIBlock x = (MPIBlock)bx;
-			List<IBlock> DF = new ArrayList<IBlock>();
-			for(IBlock by = cfg_.getEntry(); by != null; by = by.topNext()){
-				MPIBlock y = (MPIBlock)by;
-				for(Iterator<IBlock> i = y.getPreds().iterator(); i.hasNext();){
-					MPIBlock pred = (MPIBlock)i.next();
-					if(pred.getDOM().contains(x) && !(y.getDOM().contains(x) && x != y)){
-						if(!DF.contains(y)) DF.add(y);
-					}
-				}
-			}
-			x.setDF(DF);
-		}
-	}
-	
-	public void placePHI(){
-		int iterCount = 0;
-		for(IBlock b = cfg_.getEntry(); b != null; b = b.topNext()){
-			MPIBlock block = (MPIBlock)b;
-			block.hasAlready = 0;
-			block.work = 0;
-		}
-		LinkedList<IBlock> W = new LinkedList<IBlock>();
-		for(Enumeration<String> e = defTable_.keys(); e.hasMoreElements();){
-			String var = e.nextElement();
-			iterCount ++;
-			List<IBlock> defs = defTable_.get(var);
-			for(Iterator<IBlock> i = defs.iterator(); i.hasNext();){
-				MPIBlock defblock = (MPIBlock)i.next();
-				defblock.work = iterCount;
-				W.add(defblock);
-			}
-			while(!W.isEmpty()){
-				MPIBlock next = (MPIBlock)W.remove();
-				for(Iterator<IBlock> i = next.getDF().iterator(); i.hasNext();){
-					MPIBlock df = (MPIBlock)i.next();
-					if(df.hasAlready < iterCount){
-						if(df.getCond() == null && df != cfg_.getExit()){ 
-							//no associated condition?
-							System.out.println("Error: phi Node has no condition!" +  //$NON-NLS-1$
-									currentFunc_.getFuncName() + " Block " + df.getID()); //$NON-NLS-1$
-							//return;
-						}
-						df.setPhi();
-						if(!df.getDef().contains(var)) df.getDef().add(var);
-						//if(!df.getUse().contains(var)) df.getUse().add(var);
-						if(df.getUse().contains(var) && !df.getUsedPhiVar().contains(var))
-							df.getUsedPhiVar().add(var);
-						if(!df.getPhiVar().contains(var)) df.getPhiVar().add(var);
-						if(!defs.contains(df)) defs.add(df);
-						updateDefTable(df, var);
-						//System.out.println("Block " + df.getID() + " has Phi for " + var);
-						df.hasAlready = iterCount;
-						if(df.work < iterCount){
-							df.work = iterCount;
-							W.add(df);
-						}
-					}
-				}
-			}
-		}
-		for(IBlock b = cfg_.getEntry(); b != null; b = b.topNext()){
-			MPIBlock block = (MPIBlock)b;
-			if(block.hasPhi())
-				for(Iterator<String> i = block.getPhiVar().iterator(); i.hasNext();){
-					String var = i.next();
-					if(!block.getUse().contains(var))
-						block.getUse().add(var);
-				}
-		}
-	}
-	
-	protected void updateDefTable(IBlock block, String var){
-		List<IBlock> list = defTable_.get(var);
-		if(list == null){
-			System.out.print("Error in SSA!"); //$NON-NLS-1$
-			return;
-		}
-		if(!list.contains(block))
-			list.add(block);
-	}
-	
-	class ExitBlockPhi extends ASTVisitor{
-		
-		public void run(){
-			this.shouldVisitStatements = true;
-			this.shouldVisitDeclarations = true;
-			currentFunc_.getFuncDef().accept(this);
-		}
-		
-		public int visit(IASTStatement stmt){
-			MPIBlock condblock = null;
-			if(stmt instanceof IASTDoStatement){
-				IASTDoStatement doS = (IASTDoStatement)stmt;
-				condblock = (MPIBlock)cfg_.getBlock(doS.getCondition(), stmt);
-			}
-			else if(stmt instanceof IASTForStatement){
-				IASTForStatement forS = (IASTForStatement)stmt;
-				condblock = (MPIBlock)cfg_.getBlock(forS.getConditionExpression(), stmt);
-			}
-			else if(stmt instanceof IASTWhileStatement){
-				IASTWhileStatement whileS = (IASTWhileStatement)stmt;
-				condblock = (MPIBlock)cfg_.getBlock(whileS.getCondition(), stmt);
-			} 
-			else {
-				return PROCESS_CONTINUE;
-			}
-			
-			MPIBlock exitblock = null;
-			for(Iterator<IBlock> i = condblock.getSuccs().iterator(); i.hasNext();){
-				MPIBlock succ = (MPIBlock)i.next();
-				if(succ.getType() == Block.exit_join_type)
-					exitblock = succ;
-			}
-			
-			exitblock.setPhi();
-			for(Iterator<String> i = condblock.getPhiVar().iterator(); i.hasNext();){
-				String phivar = i.next();
-				if(!exitblock.getDef().contains(phivar))
-					exitblock.getDef().add(phivar);
-				if(!exitblock.getUse().contains(phivar))
-					exitblock.getUse().add(phivar);
-				if(!exitblock.getPhiVar().contains(phivar))
-					exitblock.getPhiVar().add(phivar);
-				updateDefTable(exitblock, phivar);
-			}
-			
-			return PROCESS_CONTINUE;
-		}
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPISingleAssignAnalysis.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPISingleAssignAnalysis.java
deleted file mode 100644
index 9f6ba8e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/MPISingleAssignAnalysis.java
+++ /dev/null

@@ -1,575 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis.analysis;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.*;
-import org.eclipse.cdt.core.dom.ast.c.ICASTDesignatedInitializer;
-import org.eclipse.cdt.core.dom.ast.gnu.c.ICASTKnRFunctionDeclarator;
-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;
-
-public class MPISingleAssignAnalysis {
-	protected ICallGraph cg_;
-	protected IControlFlowGraph cfg_;
-	protected MPICallGraphNode currentNode_;
-	protected Hashtable<String,Integer> assignNum_;
-	protected Hashtable<String,Boolean> type_;
-	private static final boolean traceOn=false;
-	
-	public MPISingleAssignAnalysis(ICallGraph cg){
-		cg_ = cg;
-	}
-	
-	public void run(){
-		for(ICallGraphNode n = cg_.botEntry(); n != null; n = n.botNext()){
-			MPICallGraphNode currentNode_ = (MPICallGraphNode)n;
-			if(traceOn)System.out.println(currentNode_.getFuncName());
-			cfg_ = currentNode_.getCFG();
-			assignNum_ = currentNode_.getSAVar();
-			type_ = currentNode_.getSAVarPointer();
-			dataCollector dc = new dataCollector();
-			dc.run();
-			SingleAssignAnalyzer saa = new SingleAssignAnalyzer();
-			saa.run();
-			
-			for(Enumeration<String> e = currentNode_.getSAVar().keys(); e.hasMoreElements();){
-				String var = e.nextElement();
-				if(traceOn)System.out.println(var + " is defined " + currentNode_.getSAVar().get(var).intValue() + " times"); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-	}
-	
-	class dataCollector extends ASTVisitor{
-		public void run(){
-			this.shouldVisitStatements = true;
-			this.shouldVisitDeclarations = true;
-			/* global variables */
-			for(int i=0; i<cg_.getEnv().size(); i++){
-				String var = cg_.getEnv().get(i);
-				assignNum_.put(var, new Integer(0));
-				type_.put(var, ((MPICallGraph)cg_).getGVPointer().get(i));
-			}
-			/* function parameters */
-			List<String> parameters = new ArrayList<String>();
-			List<Boolean> pointers = new ArrayList<Boolean>();
-			getParameters(currentNode_.getFuncDef(), parameters, pointers);
-			for(int i=0; i<parameters.size(); i++){
-				String var = parameters.get(i);
-				assignNum_.put(var, new Integer(0));
-				type_.put(var, pointers.get(i));
-			}
-			/* local variables */
-			currentNode_.getFuncDef().accept(this);
-		}
-		
-		protected void getParameters(IASTFunctionDefinition fd,
-				List<String> paramList, List<Boolean> pointerList){
-			IASTFunctionDeclarator fdecl = fd.getDeclarator();
-			if(fdecl instanceof IASTStandardFunctionDeclarator){
-				IASTStandardFunctionDeclarator sfunc = (IASTStandardFunctionDeclarator)fdecl;
-				IASTParameterDeclaration[] params = sfunc.getParameters();
-				for(int i=0; i<params.length; i++){
-					paramList.add(params[i].getDeclarator().getName().toString());
-					IASTPointerOperator[] pops = params[i].getDeclarator().getPointerOperators();
-					if(pops != IASTPointerOperator.EMPTY_ARRAY)
-						pointerList.add(new Boolean(true));
-					else
-						pointerList.add(new Boolean(false));
-				}
-			} else {
-				ICASTKnRFunctionDeclarator krfunc = (ICASTKnRFunctionDeclarator)fdecl;
-				IASTName[] params = krfunc.getParameterNames();
-				for(int i=0; i<params.length; i++){
-					paramList.add(params[i].toString());
-					IASTDeclarator decl = krfunc.getDeclaratorForParameterName(params[i]);
-					if(decl.getPointerOperators() != IASTPointerOperator.EMPTY_ARRAY)
-						pointerList.add(new Boolean(true));
-					else
-						pointerList.add(new Boolean(false));
-				}
-			}
-		}
-		
-		public int visit(IASTStatement stmt){
-			if(stmt instanceof IASTDeclarationStatement){
-				IASTDeclarationStatement declStmt = (IASTDeclarationStatement)stmt;
-				IASTDeclaration decl = declStmt.getDeclaration();
-				if(decl instanceof IASTSimpleDeclaration){
-					IASTSimpleDeclaration simpleDecl = (IASTSimpleDeclaration)decl;
-					IASTDeclarator[] declarators = simpleDecl.getDeclarators();
-					for(int i=0; i<declarators.length; i++){
-						String var = declarators[i].getName().toString();
-						assignNum_.put(var, new Integer(0));
-						if(declarators[i].getPointerOperators() != IASTPointerOperator.EMPTY_ARRAY)
-							type_.put(var, new Boolean(true));
-						else
-							type_.put(var, new Boolean(false));
-					}
-				}
-				return PROCESS_SKIP;
-			}
-			return PROCESS_CONTINUE;
-		}
-	}
-	
-	class SingleAssignAnalyzer extends ASTVisitor{
-
-		public void run(){
-			this.shouldVisitDeclarations = true;
-			this.shouldVisitExpressions = true;
-			this.shouldVisitStatements = true;
-			
-		}
-		
-		public int visit(IASTStatement stmt){
-			if(stmt instanceof IASTDeclarationStatement){
-				IASTDeclarationStatement declStmt = (IASTDeclarationStatement)stmt;
-				IASTDeclaration decl = declStmt.getDeclaration();
-				if(decl instanceof IASTSimpleDeclaration){
-					IASTSimpleDeclaration simpleDecl = (IASTSimpleDeclaration)decl;
-					IASTDeclarator[] declarators = simpleDecl.getDeclarators();
-					for(int i=0; i<declarators.length; i++){
-						IASTName name = declarators[i].getName();
-						IASTInitializer init = declarators[i].getInitializer();
-						if(init != null){
-							processInitializer(init, name.toString());
-						}
-					}
-				}
-				return PROCESS_SKIP;
-			}
-			return PROCESS_CONTINUE;
-		}
-		
-		protected void processInitializer(IASTInitializer init, String var){
-			if(init != null){
-				if(init instanceof IASTInitializerExpression){
-					IASTInitializerExpression initE = (IASTInitializerExpression)init;
-					IASTExpression e = initE.getExpression();
-					List<String> def = new ArrayList<String>();
-					List<String> use = new ArrayList<String>();
-					List<String> ldf = new ArrayList<String>();
-					List<String> rdf = new ArrayList<String>();
-					boolean value = saExpr(e, rhs, null, -1, def, use, ldf, rdf);
-					for(Iterator<String> i = use.iterator(); i.hasNext();){
-						String v = i.next();
-						int num = assignNum_.get(v).intValue();
-						boolean pointerType = type_.get(v).booleanValue();
-						if(pointerType) //pointers are used for math operations
-							assignNum_.put(v, new Integer(num + 2));
-					}
-					boolean pointerType = type_.get(var).booleanValue();
-					if(pointerType){
-						if(value) // init by malloc
-							assignNum_.put(var, new Integer(1));
-						else
-							assignNum_.put(var, new Integer(2));
-					} else {
-						assignNum_.put(var, new Integer(1));
-					}
-				}
-				else if(init instanceof IASTInitializerList){
-					IASTInitializerList list = (IASTInitializerList)init;
-					IASTInitializer[] inits = list.getInitializers();
-					for(int j = 0; j<inits.length; j++){
-						processInitializer(inits[j], var);
-					}
-				}
-				else if(init instanceof ICASTDesignatedInitializer){
-					System.out.println("ICASTDesignatedInitializer found !"); //$NON-NLS-1$
-				}
-			}
-		}
-		
-		public int visit(IASTExpression expr){
-			saExpr(expr, rhs, null, -1, new ArrayList<String>(), 
-					new ArrayList<String>(), new ArrayList<String>(), 
-					new ArrayList<String>());
-			return PROCESS_SKIP;
-		}
-		
-		protected final int lhs = 0;
-		protected final int rhs = 1;
-		protected final int lderef = 2; //lhs and dereference
-		protected final int rderef = 3; //rhs and dereference
-		
-		/** return: is a malloc(calloc, realloc) met? <br>
-		 * Params: def -- the set of defined variables <br>
-		 *         use -- the set of used (other than de-referenced) variables <br>
-		 *         ref -- the set of de-referenced variables
-		 */
-		protected boolean saExpr(IASTExpression expr, int side, 
-				IASTFunctionCallExpression func, int index, 
-				List<String> def, List<String> use, 
-				List<String> ldf, List<String> rdf){
-			List<String> d1 = new ArrayList<String>(); 
-			List<String> d2 = new ArrayList<String>();
-			List<String> d3 = new ArrayList<String>();
-			List<String> u1 = new ArrayList<String>(); 
-			List<String> u2 = new ArrayList<String>();
-			List<String> u3 = new ArrayList<String>();
-			List<String> lr1 = new ArrayList<String>(); 
-			List<String> lr2 = new ArrayList<String>();
-			List<String> lr3 = new ArrayList<String>();
-			List<String> rr1 = new ArrayList<String>(); 
-			List<String> rr2 = new ArrayList<String>();
-			List<String> rr3 = new ArrayList<String>();
-			boolean v1 = false, v2 = false, v3 = false;
-			if(expr == null) return false;
-			if(expr instanceof IASTArraySubscriptExpression){
-				IASTArraySubscriptExpression asE = (IASTArraySubscriptExpression)expr;
-				if(side == rhs || side == rderef){
-					v1 = saExpr(asE.getArrayExpression(), rderef, func, index, d1, u1, lr1, rr1);
-					v2 = saExpr(asE.getSubscriptExpression(), rhs, func, index, d2, u2, lr2, rr2);
-				} else {
-					v1 = saExpr(asE.getArrayExpression(), lderef, func, index, d1, u1, lr1, rr1);
-					v2 = saExpr(asE.getSubscriptExpression(), rhs, func, index, d2, u2, lr2, rr2);
-				}
-				Util.addAll(def, d1);
-				Util.addAll(def, d2);
-				Util.addAll(use, u1);
-				Util.addAll(use, u2);
-				Util.addAll(ldf, lr1);
-				Util.addAll(ldf, lr2);
-				Util.addAll(rdf, rr1);
-				Util.addAll(rdf, rr2);	
-				return v1 | v2;
-			}
-			else if(expr instanceof IASTBinaryExpression){
-				IASTBinaryExpression biE = (IASTBinaryExpression)expr;
-				int op = biE.getOperator();
-				if(op == IASTBinaryExpression.op_assign){
-					v1 = saExpr(biE.getOperand1(), lhs, func, index, d1, u1, lr1, rr1);
-					v2 = saExpr(biE.getOperand2(), rhs, func, index, d2, u2, lr2, rr2);
-					for(Iterator<String> i = d1.iterator(); i.hasNext();){
-						String var = i.next();
-						int num = assignNum_.get(var).intValue();
-						boolean pointerType = type_.get(var).booleanValue();
-						if(pointerType){
-							if(v2) // init by malloc
-								assignNum_.put(var, new Integer(num + 1));
-							else
-								assignNum_.put(var, new Integer(num + 2));
-						} else {
-							assignNum_.put(var, new Integer(num + 1));
-						}
-					}
-					for(Iterator<String> i = u1.iterator(); i.hasNext();){
-						String var = i.next();
-						int num = assignNum_.get(var).intValue();
-						boolean pointerType = type_.get(var).booleanValue();
-						if(pointerType) //pointers are used for math operations
-							assignNum_.put(var, new Integer(num + 2));
-					}	
-					for(Iterator<String> i = u2.iterator(); i.hasNext();){
-						String var = i.next();
-						int num = assignNum_.get(var).intValue();
-						boolean pointerType = type_.get(var).booleanValue();
-						if(pointerType) //pointers are used for math operations
-							assignNum_.put(var, new Integer(num + 2));
-					}	
-				}else if( op == IASTBinaryExpression.op_multiplyAssign ||
-						 op == IASTBinaryExpression.op_divideAssign ||
-						 op == IASTBinaryExpression.op_moduloAssign ||
-						 op == IASTBinaryExpression.op_plusAssign ||
-						 op == IASTBinaryExpression.op_minusAssign ||
-						 op == IASTBinaryExpression.op_shiftLeftAssign ||
-						 op == IASTBinaryExpression.op_shiftRightAssign ||
-						 op == IASTBinaryExpression.op_binaryAndAssign ||
-						 op == IASTBinaryExpression.op_binaryXorAssign ||
-						 op == IASTBinaryExpression.op_binaryOrAssign){
-					v1 = saExpr(biE.getOperand1(), lhs, func, index, d1, u1, lr1, rr1);
-					v2 = saExpr(biE.getOperand1(), rhs, func, index, d2, u2, lr2, rr2);
-					v3 = saExpr(biE.getOperand2(), rhs, func, index, d3, u3, lr2, rr3);
-					for(Iterator<String> i = d1.iterator(); i.hasNext();){
-						String var = i.next();
-						int num = assignNum_.get(var).intValue();
-						boolean pointerType = type_.get(var).booleanValue();
-						if(pointerType){
-							if(v2) // init by malloc
-								assignNum_.put(var, new Integer(num + 1));
-							else
-								assignNum_.put(var, new Integer(num + 2));
-						} else {
-							assignNum_.put(var, new Integer(num + 1));
-						}
-					}
-					for(Iterator<String> i = u2.iterator(); i.hasNext();){
-						String var = i.next();
-						int num = assignNum_.get(var).intValue();
-						boolean pointerType = type_.get(index).booleanValue();
-						if(pointerType) //pointers are used for math operations
-							assignNum_.put(var, new Integer(num + 2));
-					}	
-					for(Iterator<String> i = u3.iterator(); i.hasNext();){
-						String var = i.next();
-						int num = assignNum_.get(var).intValue();
-						boolean pointerType = type_.get(index).booleanValue();
-						if(pointerType) //pointers are used for math operations
-							assignNum_.put(var, new Integer(num + 2));
-					}
-				} else {
-					v1 = saExpr(biE.getOperand1(), rhs, func, index, d1, u1, lr1, rr1);
-					v2 = saExpr(biE.getOperand2(), rhs, func, index, d2, u2, lr2, rr2);
-				}
-				Util.addAll(def, d1);
-				Util.addAll(def, d2);
-				Util.addAll(def, d3);
-				Util.addAll(use, u1);
-				Util.addAll(use, u2);
-				Util.addAll(use, u3);
-				Util.addAll(ldf, lr1);
-				Util.addAll(ldf, lr2);
-				Util.addAll(ldf, lr3);
-				Util.addAll(rdf, rr1);
-				Util.addAll(rdf, rr2);
-				Util.addAll(rdf, rr3);
-				return v1 | v2 | v3;
-			}
-			else if(expr instanceof IASTCastExpression){
-				IASTCastExpression castE = (IASTCastExpression)expr;
-				v1 = saExpr(castE.getOperand(), side, func, index, d1, u1, lr1, rr1);
-				Util.addAll(def, d1);
-				Util.addAll(use, u1);
-				Util.addAll(ldf, lr1);
-				Util.addAll(rdf, rr1);
-				return v1;
-			}
-			else if(expr instanceof IASTConditionalExpression){
-				IASTConditionalExpression condE = (IASTConditionalExpression)expr;
-				if(side == rhs || side == rderef){
-					v1 = saExpr(condE.getLogicalConditionExpression(), side, func, index, d1, u1, lr1, rr1); 
-					v2 = saExpr(condE.getPositiveResultExpression(), side, func, index, d2, u2, lr2, rr2); 
-					v3 = saExpr(condE.getNegativeResultExpression(), side, func, index, d3, u3, lr3, rr3);
-				} else {
-					// eg. x > y ? x : y = 1
-					if(side == lhs)
-						v1 = saExpr(condE.getLogicalConditionExpression(), rhs, func, index, d1, u1, lr1, rr1);
-					else // side = lderef
-						v1 = saExpr(condE.getLogicalConditionExpression(), rderef, func, index, d1, u1, lr1, rr1);
-					v2 = saExpr(condE.getPositiveResultExpression(), side, func, index, d2, u2, lr2, rr2); 
-					v3 = saExpr(condE.getNegativeResultExpression(), side, func, index, d3, u3, lr3, rr3);
-				}
-				Util.addAll(def, d1);
-				Util.addAll(def, d2);
-				Util.addAll(def, d3);
-				Util.addAll(use, u1);
-				Util.addAll(use, u2);
-				Util.addAll(use, u3);
-				Util.addAll(ldf, lr1);
-				Util.addAll(ldf, lr2);
-				Util.addAll(ldf, lr3);
-				Util.addAll(rdf, rr1);
-				Util.addAll(rdf, rr2);
-				Util.addAll(rdf, rr3);
-				return v1 | v2 | v3;
-			}
-			else if(expr instanceof IASTExpressionList){
-				IASTExpressionList exprList = (IASTExpressionList)expr;
-				IASTExpression[] exprs = exprList.getExpressions();
-				for(int i = 0; i<exprs.length; i++){
-					if(func != null)
-						v1 = v1 | saExpr(exprs[i], side, func, i, d1, u1, lr1, rr1);
-					else
-						v1 = v1 | saExpr(exprs[i], side, func, index, d1, u1, lr1, rr1);
-					Util.addAll(def, d1);
-					Util.addAll(use, u1);
-					Util.addAll(ldf, lr1);
-					Util.addAll(rdf, rr1);
-				}
-				return v1;
-			}
-			else if(expr instanceof IASTFieldReference){
-				IASTFieldReference frE = (IASTFieldReference)expr;
-				if(side == lhs || side == lderef)
-					v1 = saExpr(frE.getFieldOwner(), lderef, func, index, d1, u1, lr1, rr1);
-				else
-					v1 = saExpr(frE.getFieldOwner(), rderef, func, index, d1, u1, lr1, rr1);
-				Util.addAll(def, d1);
-				Util.addAll(use, u1);
-				Util.addAll(ldf, lr1);
-				Util.addAll(rdf, rr1);
-				return v1;
-			}
-			else if(expr instanceof IASTFunctionCallExpression){
-				IASTFunctionCallExpression funcE = (IASTFunctionCallExpression)expr;
-				IASTExpression funcname = funcE.getFunctionNameExpression();
-				String signature = funcname.getRawSignature();
-				if(signature.equals("malloc") || signature.equals("calloc") || //$NON-NLS-1$ //$NON-NLS-2$
-						signature.equals("realloc")) //$NON-NLS-1$
-					return true;
-				IASTExpression paramE = funcE.getParameterExpression();
-				if(paramE == null) return false;
-				if(paramE instanceof IASTExpressionList)
-					v1 = saExpr(paramE, side, funcE, -1, d1, u1, lr1, rr1);
-				else
-					v1 = saExpr(paramE, side, funcE, 0, d1, u1, lr1, rr1);
-				/* update assignment number of global var */
-				MPICallGraphNode node = (MPICallGraphNode)cg_.getNode(currentNode_.getFileName(), signature);
-				if(node != null){
-					for(Iterator<String> i=cg_.getEnv().iterator(); i.hasNext();){
-						String gvar = i.next();
-						if(!u1.contains(gvar) && !rr1.contains(gvar)){
-							int fnum = node.getSAVar().get(gvar).intValue();
-							int num = assignNum_.get(gvar).intValue();
-							assignNum_.put(gvar, new Integer(fnum + num));
-						}
-					}
-				}
-				Util.addAll(def, d1);
-				Util.addAll(use, u1);
-				Util.addAll(ldf, lr1);
-				Util.addAll(rdf, rr1);
-				return v1;
-			}
-			else if(expr instanceof IASTIdExpression){
-				IASTIdExpression id = (IASTIdExpression)expr;
-				IASTName name = id.getName();
-				String var = name.toString();
-				if(var.startsWith("MPI_")) return false; //$NON-NLS-1$
-				int fnum = 0;
-				if(func != null){
-					fnum = getParamAssignNum(func, index);
-				}
-				if(side == rhs){
-					if(!use.contains(var))
-						use.add(var);
-					int num = assignNum_.get(var).intValue();
-					assignNum_.put(var, new Integer(num + fnum));
-				} else if(side == lhs){
-					if(!def.contains(var))
-						def.add(var);
-				} else if(side == lderef){
-					if(!ldf.contains(var))
-						ldf.add(var);
-				} else { //rderef
-					if(!rdf.contains(var))
-						rdf.add(var);
-					int num = assignNum_.get(var).intValue();
-					assignNum_.put(var, new Integer(num + fnum));
-				}
-				return false;
-			}
-			else if(expr instanceof IASTLiteralExpression){
-			}
-			else if(expr instanceof IASTProblemExpression){
-			}
-			else if(expr instanceof IASTTypeIdExpression){
-			}
-			else if(expr instanceof IASTUnaryExpression){
-				IASTUnaryExpression uE = (IASTUnaryExpression)expr;
-				int op = uE.getOperator();
-				if(op == IASTUnaryExpression.op_prefixIncr ||
-					  op == IASTUnaryExpression.op_prefixDecr ||
-					  op == IASTUnaryExpression.op_postFixIncr ||
-					  op == IASTUnaryExpression.op_postFixDecr) {
-					v1 = saExpr(uE.getOperand(), rhs, func, index, d1, u1, lr1, rr1);
-					v2 = saExpr(uE.getOperand(), lhs, func, index, d2, u2, lr2, rr2);
-					for(Iterator<String> i = d1.iterator(); i.hasNext();){
-						String var = i.next();
-						int num = assignNum_.get(var).intValue();
-						boolean pointerType = type_.get(var).booleanValue();
-						if(pointerType){
-							if(v2) // init by malloc
-								assignNum_.put(var, new Integer(num + 1));
-							else
-								assignNum_.put(var, new Integer(num + 2));
-						} else {
-							assignNum_.put(var, new Integer(num + 1));
-						}
-					}
-					for(Iterator<String> i = u1.iterator(); i.hasNext();){
-						String var = i.next();
-						int num = assignNum_.get(var).intValue();
-						boolean pointerType = type_.get(var).booleanValue();
-						if(pointerType) //pointers are used for math operations
-							assignNum_.put(var, new Integer(num + 2));
-					}	
-					for(Iterator<String> i = u2.iterator(); i.hasNext();){
-						String var = i.next();
-						int num = assignNum_.get(var).intValue();
-						boolean pointerType = type_.get(var).booleanValue();
-						if(pointerType) //pointers are used for math operations
-							assignNum_.put(var, new Integer(num + 2));
-					}
-					Util.addAll(def, d1);
-					Util.addAll(def, d2);
-					Util.addAll(use, u1);
-					Util.addAll(use, u2);
-					Util.addAll(ldf, lr1);
-					Util.addAll(ldf, lr2);
-					Util.addAll(rdf, rr1);
-					Util.addAll(rdf, rr2);	
-				} else {
-					v1 = saExpr(uE.getOperand(), side, func, index, d1, u1, lr1, rr1);
-					Util.addAll(def, d1);
-					Util.addAll(use, u1);
-					Util.addAll(ldf, lr1);
-					Util.addAll(rdf, rr1);
-				}
-				return v1 | v2;
-			}
-			return false;
-		}
-		
-		protected int getParamAssignNum(IASTFunctionCallExpression fE, int index){
-			if(index == -1) return 0;
-			IASTExpression funcname = fE.getFunctionNameExpression();
-			String signature = funcname.getRawSignature();
-			MPICallGraphNode node = (MPICallGraphNode)cg_.getNode(currentNode_.getFileName(), signature);
-			if(node != null){
-				Hashtable<String,Integer> funcAssignNum = node.getSAVar();
-				IASTFunctionDefinition fdef = node.getFuncDef();
-				IASTFunctionDeclarator fdecl = fdef.getDeclarator();
-				if(fdecl instanceof IASTStandardFunctionDeclarator){
-					IASTStandardFunctionDeclarator sfunc = (IASTStandardFunctionDeclarator)fdecl;
-					IASTParameterDeclaration[] params = sfunc.getParameters();
-					if(params.length <= index) return 0;
-					IASTName param = params[index].getDeclarator().getName();
-					return funcAssignNum.get(param.toString()).intValue();
-				} else {
-					ICASTKnRFunctionDeclarator krfunc = (ICASTKnRFunctionDeclarator)fdecl;
-					IASTName[] params = krfunc.getParameterNames();
-					if(params.length <= index) return 0;
-					IASTName param = params[index];
-					return funcAssignNum.get(param.toString()).intValue();
-				}
-			} else {
-				/* Library function calls. Any parameter whose address
-				 * is taken (pointer or array) is both defined and used.
-				 */
-				IASTExpression parameterE = fE.getParameterExpression();
-				if(parameterE instanceof IASTExpressionList){
-					IASTExpressionList paramEList = (IASTExpressionList)parameterE;
-					IASTExpression param = (paramEList.getExpressions())[index];
-					IType type = param.getExpressionType();
-					if(type instanceof IArrayType || 
-							type instanceof IPointerType) return 2;
-				}
-				else{
-					IType type = parameterE.getExpressionType();
-					if(type instanceof IArrayType || 
-							type instanceof IPointerType) return 2;
-				}
-			}
-			return 0;
-		}
-	}
-	
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/UseDefBuilder.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/UseDefBuilder.java
deleted file mode 100644
index 1de7470..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/UseDefBuilder.java
+++ /dev/null

@@ -1,468 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis.analysis;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.*;
-import org.eclipse.cdt.core.dom.ast.c.ICASTDesignatedInitializer;
-import org.eclipse.cdt.core.dom.ast.c.ICASTTypeIdInitializerExpression;
-import org.eclipse.cdt.core.dom.ast.gnu.c.ICASTKnRFunctionDeclarator;
-import org.eclipse.cdt.internal.core.dom.parser.IASTAmbiguousExpression;
-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;
-
-
-/** 
- * Calculate the (inter-procedural) use set and def set of each block.
- * @author Yuan Zhang
- *
- */
-public class UseDefBuilder extends ASTVisitor{
-	protected ICallGraph cg_;
-	protected IControlFlowGraph cfg_ = null;
-	
-	protected List<String> use_ = null;
-	protected List<String> def_ = null;
-	protected List<String> guse_ = null;
-	protected List<String> gdef_ = null;
-	protected List<String> padef_ = null;
-
-	protected final int lhs = 0;
-	protected final int rhs = 1;
-	
-	protected MPICallGraphNode currentFunc_;
-	protected Hashtable<String,List<IBlock>> defTable_ = null;
-	
-	public UseDefBuilder(ICallGraph cg){
-		cg_ = cg;
-	}
-	
-	public void run(){
-		this.shouldVisitDeclarations = true;
-		this.shouldVisitExpressions = true;
-		this.shouldVisitStatements = true;
-		
-		/* Fix point to deal with the recursion */
-		boolean change = true;
-		while(change){
-			change = false;
-			for(ICallGraphNode n = cg_.botEntry(); n != null; n = n.botNext()){
-				MPICallGraphNode node = (MPICallGraphNode)n;
-				//if(node.getFuncName().equals("yytnamerr"))
-					//System.out.println(node.getFuncName());
-				if(!node.marked) continue;
-				List<String> oldguse_ = node.getGlobalUse();
-				List<String> oldgdef_ = node.getGlobalDef();
-				List<String> oldpadef_ = node.getParamDef();
-				guse_ = new ArrayList<String>();
-				gdef_ = new ArrayList<String>();
-				padef_ = new ArrayList<String>();
-				cfg_ = node.getCFG();
-				currentFunc_ = node;
-				for(IBlock b = cfg_.getEntry().topNext(); b != null; b = b.topNext()){
-					MPIBlock block = (MPIBlock)b;
-					IASTNode content = block.getContent();
-					if(content == null || content instanceof IASTName) continue;
-					List<String> olduse_ = block.getUse();
-					List<String> olddef_ = block.getDef();
-					use_ = new ArrayList<String>();
-					def_ = new ArrayList<String>();
-					if(content instanceof IASTExpression){
-						IASTExpression expr = (IASTExpression)content;
-						expr.accept(this);
-					} else { //statement
-						IASTStatement stmt = (IASTStatement)content;
-						stmt.accept(this);
-					}
-					if(!Util.equals(use_, olduse_)){
-						block.setUse(use_);
-						change = true;
-					}
-					if(!Util.equals(def_, olddef_)){
-						block.setDef(def_);
-						change = true;
-					}
-				}
-				if(!Util.equals(guse_, oldguse_)){
-					node.setGlobalUse(guse_);
-					change = true;
-				}
-				if(!Util.equals(gdef_, oldgdef_)){
-					node.setGlobalDef(gdef_);
-					change = true;
-				}
-				if(!Util.equals(padef_, oldpadef_)){
-					node.setParamDef(padef_);
-					change = true;
-				}
-			}
-		}
-		
-		for(ICallGraphNode n = cg_.botEntry(); n != null; n = n.botNext()){
-			MPICallGraphNode node = (MPICallGraphNode)n;
-			if(!node.marked) continue;
-			currentFunc_ = node;
-			cfg_ = node.getCFG();
-			setEntryBlock((MPIBlock)node.getCFG().getEntry());
-			setExitBlock((MPIBlock)node.getCFG().getExit());
-			defTable_ = new Hashtable<String,List<IBlock>>();
-			for(IBlock b = cfg_.getEntry(); b != null; b = b.topNext()){
-				MPIBlock block = (MPIBlock)b;
-				List<String> def = block.getDef();
-				if(def.isEmpty()) continue;
-				for(Iterator<String> i = def.iterator(); i.hasNext();){
-					String var = i.next();
-					List<IBlock> defblocks = defTable_.get(var);
-					if(defblocks == null){
-						defblocks = new ArrayList<IBlock>();
-						defblocks.add(block);
-						defTable_.put(var, defblocks);
-					} else {
-						defblocks.add(block);
-						defTable_.put(var, defblocks);
-					}
-				}
-			}
-			node.setDefTable(defTable_);
-		}
-	}
-	
-	public int visit(IASTStatement stmt){
-		if(stmt instanceof IASTDeclarationStatement){
-			IASTDeclarationStatement declStmt = (IASTDeclarationStatement)stmt;
-			IASTDeclaration decl = declStmt.getDeclaration();
-			if(decl instanceof IASTSimpleDeclaration){
-				IASTSimpleDeclaration simpleDecl = (IASTSimpleDeclaration)decl;
-				IASTDeclarator[] declarators = simpleDecl.getDeclarators();
-				for(int i=0; i<declarators.length; i++){
-					IASTName name = declarators[i].getName();
-					IASTInitializer init = declarators[i].getInitializer();
-					if(init != null)
-						def_.add(name.toString());
-					processInitializer(init);
-				}
-			}
-			return PROCESS_SKIP;
-		}
-		return PROCESS_CONTINUE;
-	}
-	
-	private void processInitializer(IASTInitializer init){
-		if(init != null){
-			if(init instanceof IASTInitializerExpression){
-				IASTInitializerExpression initE = (IASTInitializerExpression)init;
-				IASTExpression e = initE.getExpression();
-				useDefSet(e, rhs, null, -1);
-			}
-			else if(init instanceof IASTInitializerList){
-				IASTInitializerList list = (IASTInitializerList)init;
-				IASTInitializer[] inits = list.getInitializers();
-				for(int j = 0; j<inits.length; j++){
-					processInitializer(inits[j]);
-				}
-			}
-			else if(init instanceof ICASTDesignatedInitializer){
-				System.out.println("ICASTDesignatedInitializer found !"); //$NON-NLS-1$
-			}
-		}
-	}
-	
-	/** 
-	 * The traverse is stopped (by PROCESS_SKIP) when the expression of 
-	 * the statement is visited. This method is used to find the expression.
-	 */
-	public int visit(IASTExpression expr){
-		useDefSet(expr, rhs, null, -1);
-		return PROCESS_SKIP;
-	}
-
-
-
-	/**
-	 * 
-	 * @param expr The expression being analyzed
-	 * @param side lhs if it is defined, rhs otherwise (rhs)
-	 * @param funcall the function call expression
-	 * @param index  the index of the current parameter in funcall
-	 */
-	public void useDefSet(IASTExpression expr, int side, 
-			IASTFunctionCallExpression funcall, int index){
-		// Null expression for empty function parameter 
-		if(expr == null) return; 
-		if(expr instanceof IASTAmbiguousExpression){
-		}
-		else if(expr instanceof IASTArraySubscriptExpression){
-			IASTArraySubscriptExpression asE = (IASTArraySubscriptExpression)expr;
-			if(side == rhs){
-				// = a[index_expr]
-				useDefSet(asE.getArrayExpression(), rhs, funcall, index); 
-				useDefSet(asE.getSubscriptExpression(), rhs, funcall, index);
-			} else { //lhs
-				// a[b[i]] = ... , a is defined, b and i are used
-				useDefSet(asE.getSubscriptExpression(), rhs, funcall, index);
-				useDefSet(asE.getArrayExpression(), lhs, funcall, index);
-			}
-		}
-		else if(expr instanceof IASTBinaryExpression){
-			IASTBinaryExpression biE = (IASTBinaryExpression)expr;
-			int op = biE.getOperator();
-			if(op == IASTBinaryExpression.op_assign){
-				// x = y = z is right associative --> x = (y = z)
-				// So the "side" will be always rhs
-				useDefSet(biE.getOperand1(), lhs, funcall, index);
-				useDefSet(biE.getOperand2(), rhs, funcall, index);
-			}
-			else if( op == IASTBinaryExpression.op_multiplyAssign ||
-					 op == IASTBinaryExpression.op_divideAssign ||
-					 op == IASTBinaryExpression.op_moduloAssign ||
-					 op == IASTBinaryExpression.op_plusAssign ||
-					 op == IASTBinaryExpression.op_minusAssign ||
-					 op == IASTBinaryExpression.op_shiftLeftAssign ||
-					 op == IASTBinaryExpression.op_shiftRightAssign ||
-					 op == IASTBinaryExpression.op_binaryAndAssign ||
-					 op == IASTBinaryExpression.op_binaryXorAssign ||
-					 op == IASTBinaryExpression.op_binaryOrAssign){
-				useDefSet(biE.getOperand1(), rhs, funcall, index);
-				useDefSet(biE.getOperand2(), rhs, funcall, index);
-				useDefSet(biE.getOperand1(), lhs, funcall, index);
-			} 
-			else {
-				useDefSet(biE.getOperand1(), rhs, funcall, index);
-				useDefSet(biE.getOperand2(), rhs, funcall, index);
-			}
-		}
-		else if(expr instanceof IASTCastExpression){
-			IASTCastExpression castE = (IASTCastExpression)expr;
-			useDefSet(castE.getOperand(), side, funcall, index);
-		}
-		else if(expr instanceof IASTConditionalExpression){
-			IASTConditionalExpression condE = (IASTConditionalExpression)expr;
-			if(side == rhs){
-				useDefSet(condE.getLogicalConditionExpression(), rhs, funcall, index); 
-				useDefSet(condE.getPositiveResultExpression(), rhs, funcall, index); 
-				useDefSet(condE.getNegativeResultExpression(), rhs, funcall, index);
-			} else {
-				// eg. x > y ? x : y = 1
-				useDefSet(condE.getLogicalConditionExpression(), rhs, funcall, index); 
-				useDefSet(condE.getPositiveResultExpression(), lhs, funcall, index); 
-				useDefSet(condE.getNegativeResultExpression(), lhs, funcall, index);
-			}
-		}
-		else if(expr instanceof IASTExpressionList){
-			IASTExpressionList exprList = (IASTExpressionList)expr;
-			IASTExpression[] exprs = exprList.getExpressions();
-			for(int i = 0; i<exprs.length; i++){
-				if(funcall != null)
-					useDefSet(exprs[i], side, funcall, i);
-				else
-					useDefSet(exprs[i], side, funcall, index);
-			}
-		}
-		else if(expr instanceof IASTFieldReference){
-			IASTFieldReference frE = (IASTFieldReference)expr;
-			useDefSet(frE.getFieldOwner(), side, funcall, index);
-		}
-		else if(expr instanceof IASTFunctionCallExpression){
-			IASTFunctionCallExpression funcE = (IASTFunctionCallExpression)expr;
-			IASTExpression funcname = funcE.getFunctionNameExpression();
-			String signature = funcname.getRawSignature();
-			MPICallGraphNode n = (MPICallGraphNode)cg_.getNode(currentFunc_.getFileName(), signature);
-			if(n != null){
-				gdef_ = Util.Union(gdef_, n.getGlobalDef());
-				guse_ = Util.Union(guse_, n.getGlobalUse());
-				def_ = Util.Union(def_, n.getGlobalDef());
-				use_ = Util.Union(use_, n.getGlobalUse());
-			}
-			IASTExpression paramE = funcE.getParameterExpression();
-			if(paramE == null) return;
-			if(paramE instanceof IASTExpressionList)
-				useDefSet(funcE.getParameterExpression(), side, funcE, -1);
-			else
-				useDefSet(funcE.getParameterExpression(), side, funcE, 0);
-		}
-		else if(expr instanceof IASTIdExpression){
-			IASTIdExpression id = (IASTIdExpression)expr;
-			IASTName name = id.getName();
-			String var = name.toString();
-			if(var.startsWith("MPI_")) return; //$NON-NLS-1$
-			if(side == rhs){
-				if(!use_.contains(var)) 
-					use_.add(var);
-				if(cg_.getEnv().contains(var) && !guse_.contains(var)) 
-					guse_.add(var);
-				if(funcall != null){
-					if(isDefinedParam(funcall, index)){
-						if(!def_.contains(var))
-							def_.add(var);
-						if(cg_.getEnv().contains(var) && !gdef_.contains(var))
-							gdef_.add(var);
-						if(isPassableParam(var) && !padef_.contains(var))
-							padef_.add(var);
-					}
-				}
-			} else { //lhs
-				if(!def_.contains(var)) 
-					def_.add(var);
-				if(cg_.getEnv().contains(var) && !gdef_.contains(var)) 
-					gdef_.add(var);
-				if(isPassableParam(var) && !padef_.contains(var)) 
-					padef_.add(var);
-			}
-		}
-		else if(expr instanceof IASTLiteralExpression){
-		}
-		else if(expr instanceof IASTProblemExpression){
-		}
-		else if(expr instanceof IASTTypeIdExpression){
-		}
-		else if(expr instanceof IASTUnaryExpression){
-			IASTUnaryExpression uE = (IASTUnaryExpression)expr;
-			int op = uE.getOperator();
-			if(op == IASTUnaryExpression.op_prefixIncr ||
-				  op == IASTUnaryExpression.op_prefixDecr ||
-				  op == IASTUnaryExpression.op_postFixIncr ||
-				  op == IASTUnaryExpression.op_postFixDecr) {
-				useDefSet(uE.getOperand(), rhs, funcall, index);
-				useDefSet(uE.getOperand(), lhs, funcall, index);
-			} else {
-				useDefSet(uE.getOperand(), side, funcall, index);
-			}
-		}
-		else if(expr instanceof ICASTTypeIdInitializerExpression){
-		}
-		else{
-		}
-	}
-	
-	private boolean isPassableParam(String name){
-		IASTFunctionDefinition fdef = currentFunc_.getFuncDef();
-		IASTFunctionDeclarator fdecl = fdef.getDeclarator();
-		if(fdecl instanceof IASTStandardFunctionDeclarator){
-			IASTStandardFunctionDeclarator sfunc = (IASTStandardFunctionDeclarator)fdecl;
-			IASTParameterDeclaration[] params = sfunc.getParameters();
-			for(int i = 0; i < params.length; i++){
-				IASTName param = params[i].getDeclarator().getName();
-				IASTPointerOperator[] pops = params[i].getDeclarator().getPointerOperators();
-				if(name.equals(param.toString()) && pops != IASTPointerOperator.EMPTY_ARRAY){
-					return true;
-				}
-			}
-		} else {
-			ICASTKnRFunctionDeclarator krfunc = (ICASTKnRFunctionDeclarator)fdecl;
-			IASTName[] params = krfunc.getParameterNames();
-			for(int i=0; i<params.length; i++){
-				if(name.equals(params[i].toString())){
-					IASTDeclarator decl = krfunc.getDeclaratorForParameterName(params[i]);
-					if(decl.getPointerOperators() != IASTPointerOperator.EMPTY_ARRAY)
-						return true;
-				}
-			}
-		}
-		return false;
-	}
-	
-	private boolean isDefinedParam(IASTFunctionCallExpression fE, int index){
-		if(index == -1) return false;
-		IASTExpression funcname = fE.getFunctionNameExpression();
-		String signature = funcname.getRawSignature();
-		MPICallGraphNode node = (MPICallGraphNode)cg_.getNode(currentFunc_.getFileName(), signature);
-		if(node != null){
-			List<String> padef = node.getParamDef();
-			IASTFunctionDefinition fdef = node.getFuncDef();
-			IASTFunctionDeclarator fdecl = fdef.getDeclarator();
-			if(fdecl instanceof IASTStandardFunctionDeclarator){
-				IASTStandardFunctionDeclarator sfunc = (IASTStandardFunctionDeclarator)fdecl;
-				IASTParameterDeclaration[] params = sfunc.getParameters();
-				if(params.length <= index) return false;
-				IASTName param = params[index].getDeclarator().getName();
-				if(padef.contains(param.toString())) return true;
-			} else {
-				ICASTKnRFunctionDeclarator krfunc = (ICASTKnRFunctionDeclarator)fdecl;
-				IASTName[] params = krfunc.getParameterNames();
-				if(params.length <= index) return false;
-				IASTName param = params[index];
-				if(padef.contains(param.toString())) return true;
-			}
-		} else {
-			/* Library function calls. Any parameter whose address
-			 * is taken (pointer or array) is both defined and used.
-			 */
-			IASTExpression parameterE = fE.getParameterExpression();
-			if(parameterE instanceof IASTExpressionList){
-				IASTExpressionList paramEList = (IASTExpressionList)parameterE;
-				IASTExpression param = (paramEList.getExpressions())[index];
-				IType type = param.getExpressionType();
-				if(type instanceof IArrayType || 
-						type instanceof IPointerType) return true;
-			}
-			else{
-				IType type = parameterE.getExpressionType();
-				if(type instanceof IArrayType || 
-						type instanceof IPointerType) return true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * All parameters of a function and used globals are assumed to be 
-	 * defined at the entry block.
-	 */
-	private void setEntryBlock(MPIBlock entry){
-		List<String> def = new ArrayList<String>();
-		IASTFunctionDefinition fdef = currentFunc_.getFuncDef();
-		IASTFunctionDeclarator fdecl = fdef.getDeclarator();
-		if(fdecl instanceof IASTStandardFunctionDeclarator){
-			IASTStandardFunctionDeclarator sfunc = (IASTStandardFunctionDeclarator)fdecl;
-			IASTParameterDeclaration[] params = sfunc.getParameters();
-			for(int i=0; i<params.length; i++){
-				IASTName param = params[i].getDeclarator().getName();
-				def.add(param.toString());
-			}
-		} else {
-			ICASTKnRFunctionDeclarator krfunc = (ICASTKnRFunctionDeclarator)fdecl;
-			IASTName[] params = krfunc.getParameterNames();
-			for(int i=0; i<params.length; i++){
-				IASTName param = params[i];
-				def.add(param.toString());
-			}
-		}
-		for(Iterator<String> i = currentFunc_.getGlobalUse().iterator(); i.hasNext();){
-			def.add(i.next());
-		}
-		entry.setDef(def);
-		entry.setUse(new ArrayList<String>());
-	}	
-	
-	/**
-	 *  All defined global variables and defined passable parameters are assumed 
-	 * to be used in the exit block
-	 */
-	private void setExitBlock(MPIBlock exit){
-		List<String> use = new ArrayList<String>();
-		for(Iterator<String> i = currentFunc_.getGlobalDef().iterator(); i.hasNext();){
-			use.add(i.next());
-		}
-		for(Iterator<String> i = currentFunc_.getParamDef().iterator(); i.hasNext();){
-			use.add(i.next());
-		}
-		
-		exit.setUse(use);
-		exit.setDef(new ArrayList<String>());
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/Util.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/Util.java
deleted file mode 100644
index 5a3a785..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/analysis/Util.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis.analysis;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-public class Util {
-	
-	public static List Intersect(List A, List B){
-		if(A == null || B == null) return null;
-		List list = new ArrayList();
-		for(Iterator i = A.iterator(); i.hasNext();){
-			Object o = i.next();
-			if(B.contains(o)) list.add(o);
-		}
-		return list;
-	}
-	
-	public static boolean equals(List A, List B){
-		if(A == null && B == null) return true;
-		if(A == null && B != null) return false;
-		if(A != null && B == null) return false;
-		if(A.size() != B.size()) return false;
-		for(Iterator i = A.iterator(); i.hasNext();){
-			if(!B.contains(i.next())) return false;
-		}
-		return true;
-	}
-	
-	public static List Union(List A, List B){
-		if(A == null) return B;
-		if(B == null) return A;
-		List list = new ArrayList(A);
-		for(Iterator i = B.iterator(); i.hasNext();){
-			Object o = i.next();
-			if(!list.contains(o)) list.add(o);
-		}
-		return list;
-	}
-	
-	public static List Union(List A, List B, List C){
-		return Union(Union(A, B), C);
-	}
-	
-	/* 
-	 * @ return: A - B 
-	 */
-	public static List Minus(List A, List B){
-		if(B.isEmpty()) return A;
-		List list = new ArrayList();
-		for(Iterator i = A.iterator(); i.hasNext();){
-			Object o = i.next();
-			if(!B.contains(o)) list.add(o);
-		}
-		return list;
-	}
-	
-	/* to = Union(to, from) */
-	public static void addAll(List to, List from){
-		if(from == null) return;
-		if(from.size() == 0) return;
-		for(Iterator i = from.iterator(); i.hasNext();){
-			String s = (String)i.next();
-			if(!to.contains(s))
-				to.add(s);
-		}
-	}
-	
-	public static List copy(List oldlist){
-		List list = new ArrayList();
-		for(Iterator i = oldlist.iterator(); i.hasNext();){
-			list.add(i.next());
-		}
-		return list;
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/messages/Messages.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/messages/Messages.java
deleted file mode 100644
index d5da7f7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/messages/Messages.java
+++ /dev/null

@@ -1,91 +0,0 @@
-package org.eclipse.ptp.pldt.mpi.analysis.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.pldt.mpi.analysis.messages.messages"; //$NON-NLS-1$
-	public static String MPIBarrierMatching_barrierSyncError;
-	public static String MPIBarrierMatching_foundBarrierSyncError;
-	public static String MPIBarrierMatching_mpiBarrierAnalysis;
-	public static String MPIBarrierMatchingSetView_indexNum;
-	public static String MPIBarrierMatchingSetView_matchingSetArtifacts;
-	public static String MPIBarrierView_barrierArtifacts;
-	public static String MPIBarrierView_function;
-	public static String MPIBarrierView_indexNo;
-	public static String MPIErrorView_matchingSetArtifacts;
-	public static String RunAnalyseMPIAnalysiscommandHandler_noFilesSelectedForAnalysis;
-	public static String RunAnalyseMPIAnalysiscommandHandler_pleaseSelect;
-	public static String RunAnalyseMPIAnalysiscommandHandler_remoteNotSupported;
-	public static String RunAnalyseMPIAnalysiscommandHandler_remoteProjectFound;
-	public static String ShowMatchSet_noBarrierAnalysisHasBeenPerformed;
-	public static String ShowMatchSet_noSelectionsMade;
-	public static String ShowMatchSet_noSelectionsMande;
-	public static String ShowMatchSet_PleaseSelectABarrier;
-	public static String ShowMatchSet_showMatchSet;
-	public static String SimpleTableBarrierView_38;
-	public static String SimpleTableBarrierView_areShownInThisView;
-	public static String SimpleTableBarrierView_areShownInThisViewDot;
-	public static String SimpleTableBarrierView_artifact;
-	public static String SimpleTableBarrierView_artifacts;
-	public static String SimpleTableBarrierView_constant;
-	public static String SimpleTableBarrierView_description;
-	public static String SimpleTableBarrierView_determineWhich;
-	public static String SimpleTableBarrierView_file_name;
-	public static String SimpleTableBarrierView_filename;
-	public static String SimpleTableBarrierView_filter;
-	public static String SimpleTableBarrierView_filterWhich;
-	public static String SimpleTableBarrierView_functionCall;
-	public static String SimpleTableBarrierView_information;
-	public static String SimpleTableBarrierView_line_number;
-	public static String SimpleTableBarrierView_lineNo;
-	public static String SimpleTableBarrierView_name;
-	public static String SimpleTableBarrierView_no;
-	public static String SimpleTableBarrierView_none;
-	public static String SimpleTableBarrierView_selected;
-	public static String SimpleTableBarrierView_showDetailedInfoForSelected;
-	public static String SimpleTableBarrierView_showInfo;
-	public static String SimpleTableBarrierView_value;
-	public static String SimpleTreeTableMarkerView_areShownInThisView;
-	public static String SimpleTreeTableMarkerView_areShownInThisView2;
-	public static String SimpleTreeTableMarkerView_artifact;
-	public static String SimpleTreeTableMarkerView_artifacts;
-	public static String SimpleTreeTableMarkerView_barrierMatchingSet;
-	public static String SimpleTreeTableMarkerView_constant;
-	public static String SimpleTreeTableMarkerView_description;
-	public static String SimpleTreeTableMarkerView_determineWhich;
-	public static String SimpleTreeTableMarkerView_file_name;
-	public static String SimpleTreeTableMarkerView_filename;
-	public static String SimpleTreeTableMarkerView_filter;
-	public static String SimpleTreeTableMarkerView_filterWhich;
-	public static String SimpleTreeTableMarkerView_function;
-	public static String SimpleTreeTableMarkerView_functionCall;
-	public static String SimpleTreeTableMarkerView_indexNo;
-	public static String SimpleTreeTableMarkerView_information;
-	public static String SimpleTreeTableMarkerView_line_number;
-	public static String SimpleTreeTableMarkerView_lineNo;
-	public static String SimpleTreeTableMarkerView_name;
-	public static String SimpleTreeTableMarkerView_no;
-	public static String SimpleTreeTableMarkerView_none;
-	public static String SimpleTreeTableMarkerView_removeMarkers;
-	public static String SimpleTreeTableMarkerView_selected;
-	public static String SimpleTreeTableMarkerView_showDetailedInfoForSelected;
-	public static String SimpleTreeTableMarkerView_showInfo;
-	public static String SimpleTreeTableMarkerView_value;
-	
-	public static String ShowErrors_barrier;
-	public static String ShowErrors_barrier_;
-	public static String ShowErrors_barriers;
-	public static String ShowErrors_counterExample;
-	public static String ShowErrors_loopDynamicNumberOfBarriers;
-	public static String ShowErrors_path1;
-	public static String ShowErrors_path1DynamicNumberOfBarriers;
-	public static String ShowErrors_path2;
-	public static String ShowErrors_path2dynamicNumberOfBarriers;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/messages/messages.properties b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/messages/messages.properties
deleted file mode 100644
index 0da94bc..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/messages/messages.properties
+++ /dev/null

@@ -1,77 +0,0 @@
-MPIBarrierMatching_barrierSyncError=Barrier Synchronization Error
-MPIBarrierMatching_foundBarrierSyncError=Found barrier synchronization error(s)\!
-MPIBarrierMatching_mpiBarrierAnalysis=MPI Barrier Analysis
-MPIBarrierMatchingSetView_indexNum=IndexNum
-MPIBarrierMatchingSetView_matchingSetArtifacts=Matching Set Artifacts
-MPIBarrierView_barrierArtifacts=Barrier Artifacts
-MPIBarrierView_function=Function
-MPIBarrierView_indexNo=IndexNo
-MPIErrorView_matchingSetArtifacts=Matching Set Artifacts
-RunAnalyseMPIAnalysiscommandHandler_noFilesSelectedForAnalysis=No files selected for analysis.
-RunAnalyseMPIAnalysiscommandHandler_pleaseSelect=Please select a source file  or container (folder or project) to analyze.
-RunAnalyseMPIAnalysiscommandHandler_remoteNotSupported=MPI Barrier Analysis currently is not supported on remote projects
-RunAnalyseMPIAnalysiscommandHandler_remoteProjectFound=Remote Project found
-ShowMatchSet_noBarrierAnalysisHasBeenPerformed=No Barrier Analysis has been performed
-ShowMatchSet_noSelectionsMade=No selections made
-ShowMatchSet_noSelectionsMande=No selections made
-ShowMatchSet_PleaseSelectABarrier=Please select a barrier
-ShowMatchSet_showMatchSet=Show Match Set
-SimpleTableBarrierView_38=Resource 
-SimpleTableBarrierView_areShownInThisView=\ are shown in this view
-SimpleTableBarrierView_areShownInThisViewDot=\ are shown in this view.
-SimpleTableBarrierView_artifact=Artifact
-SimpleTableBarrierView_artifacts=Artifacts
-SimpleTableBarrierView_constant=Constant
-SimpleTableBarrierView_description=\nDescription: 
-SimpleTableBarrierView_determineWhich=\nDetermine which 
-SimpleTableBarrierView_file_name=\nFile name: 
-SimpleTableBarrierView_filename=Filename
-SimpleTableBarrierView_filter=Filter 
-SimpleTableBarrierView_filterWhich=Filter which 
-SimpleTableBarrierView_functionCall=Function Call
-SimpleTableBarrierView_information=\ information
-SimpleTableBarrierView_line_number=\nLine number: 
-SimpleTableBarrierView_lineNo=LineNo
-SimpleTableBarrierView_name=\nName: 
-SimpleTableBarrierView_no=No 
-SimpleTableBarrierView_none=None
-SimpleTableBarrierView_selected=\ selected.
-SimpleTableBarrierView_showDetailedInfoForSelected=Show detailed info for selected 
-SimpleTableBarrierView_showInfo=Show Info
-SimpleTableBarrierView_value=Value
-SimpleTreeTableMarkerView_areShownInThisView=\ are shown in this view.
-SimpleTreeTableMarkerView_areShownInThisView2=\ are shown in this view
-SimpleTreeTableMarkerView_artifact=Artifact
-SimpleTreeTableMarkerView_artifacts=Artifacts
-SimpleTreeTableMarkerView_barrierMatchingSet=Barrier Matching Set
-SimpleTreeTableMarkerView_constant=Constant
-SimpleTreeTableMarkerView_description=\nDescription: 
-SimpleTreeTableMarkerView_determineWhich=\nDetermine which 
-SimpleTreeTableMarkerView_file_name=\nFile name: 
-SimpleTreeTableMarkerView_filename=Filename
-SimpleTreeTableMarkerView_filter=Filter 
-SimpleTreeTableMarkerView_filterWhich=Filter which 
-SimpleTreeTableMarkerView_function=Function
-SimpleTreeTableMarkerView_functionCall=Function Call
-SimpleTreeTableMarkerView_indexNo=IndexNo
-SimpleTreeTableMarkerView_information=\ information
-SimpleTreeTableMarkerView_line_number=\nLine number: 
-SimpleTreeTableMarkerView_lineNo=LineNo
-SimpleTreeTableMarkerView_name=\nName: 
-SimpleTreeTableMarkerView_no=No 
-SimpleTreeTableMarkerView_none=None
-SimpleTreeTableMarkerView_removeMarkers=Remove Markers
-SimpleTreeTableMarkerView_selected=\ selected.
-SimpleTreeTableMarkerView_showDetailedInfoForSelected=Show detailed info for selected 
-SimpleTreeTableMarkerView_showInfo=Show Info
-SimpleTreeTableMarkerView_value=Value
-
-ShowErrors_barrier=Barrier
-ShowErrors_barrier_=Barrier 
-ShowErrors_barriers=\ barrier(s))
-ShowErrors_counterExample=Counter Example
-ShowErrors_loopDynamicNumberOfBarriers=Loop (dynamic number of barriers)
-ShowErrors_path1=Path 1 (
-ShowErrors_path1DynamicNumberOfBarriers=Path 1 (dynamic number of barriers)
-ShowErrors_path2=Path 2 (
-ShowErrors_path2dynamicNumberOfBarriers=Path 2 (dynamic number of barriers)

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/popup/actions/ShowMatchSet.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/popup/actions/ShowMatchSet.java
deleted file mode 100644
index 39e8746..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/popup/actions/ShowMatchSet.java
+++ /dev/null

@@ -1,209 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis.popup.actions;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.LinkedList;
-
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.internal.ui.editor.CEditor;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.util.Utility;
-import org.eclipse.ptp.pldt.common.util.ViewActivator;
-import org.eclipse.ptp.pldt.mpi.analysis.IDs;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.BarrierTable;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.BarrierTable.BarrierInfo;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.MPIBarrierAnalysisResults;
-import org.eclipse.ptp.pldt.mpi.analysis.messages.Messages;
-import org.eclipse.ptp.pldt.mpi.analysis.view.MPIArtifactMarkingVisitor;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.actions.ActionDelegate;
-
-/**
- * Action to show the matching set for a barrier.<br>
- *  Most methods in this class are borrowed from 
- * org.eclipse.ptp.pldt.openmp.analysis.textview.ShowConcurrencyAction.java
- */
-
-public class ShowMatchSet extends ActionDelegate 
-						  implements IEditorActionDelegate{
-
-	protected CEditor editor_ = null;
-	protected MPIBarrierAnalysisResults results_ = null;
-	private static final boolean traceOn=false;
-
-	
-	protected static final String TITLE = Messages.ShowMatchSet_showMatchSet;
-	
-	public ShowMatchSet(){
-		if(traceOn)System.out.println("ShowMatchSet() constructed..."); //$NON-NLS-1$
-	}
-
-    public void setActiveEditor(IAction action, IEditorPart targetEditor){
-        if (targetEditor instanceof CEditor)
-            editor_ = (CEditor)targetEditor;
-    }
-    
-    public void runWithEvent(IAction action, Event event) {
-        TextSelection selection = null;
-        if (editor_!=null && 
-            editor_.getSelectionProvider().getSelection() instanceof TextSelection) {
-            selection = (TextSelection)editor_.getSelectionProvider().getSelection();
-        }
-        
-        if (selection!=null) {
-            showMatchSet(selection);
-        }
-        else 
-            showMessage(TITLE, Messages.ShowMatchSet_noSelectionsMade);
-    }
-    
-    protected void showMessage(String title, String message){
-        MessageDialog.openInformation(getStandardDisplay().getActiveShell(), title, message);
-    }
-    
-    public static Display getStandardDisplay() {
-        Display display= Display.getCurrent();
-        if (display == null) {
-            display= Display.getDefault();
-        }
-        return display;     
-    }
-    
-    protected void showMatchSet(TextSelection selection){
-        if (selection.getOffset()==0 && selection.getLength()==0) {
-            showMessage(TITLE, Messages.ShowMatchSet_noSelectionsMande);
-            return;
-        }
-        
-		/* first clear all existing markers */
-		IWorkspaceRoot wsResource = ResourcesPlugin.getWorkspace().getRoot();
-		try {
-			int depth = IResource.DEPTH_INFINITE;
-			wsResource.deleteMarkers(IDs.matchingSetMarkerID, false, depth);
-
-        } catch (CoreException e) {
-            System.out.println("RM: exception deleting markers."); //$NON-NLS-1$
-            e.printStackTrace();
-        }
-        
-        results_ = MPIBarrierAnalysisResults.getAnalysisResults();
-        if (results_ == null) {
-            showMessage(TITLE, Messages.ShowMatchSet_noBarrierAnalysisHasBeenPerformed);
-            return;
-        }
-        IEditorInput ieu = editor_.getEditorInput();
-        IFile file= null;
-        if(ieu instanceof IFileEditorInput){
-        	file=((IFileEditorInput)ieu).getFile();  // cdt40
-        }
-        //IFile file = editor_.getInputFile();//cdt31
-        String fileName = file.getFullPath().toOSString();
-        //String filename2 = Utility.getInputFile(editor_);
-        /* This filename may not contain the FULL path information */
-
-        BarrierInfo barrier = findSelectedBarrier(fileName, selection.getOffset());
-        if(barrier == null){
-        	showMessage(TITLE, Messages.ShowMatchSet_PleaseSelectABarrier);
-        	return;
-        }
-        
-        removeMarkers(editor_.getDocumentProvider().getAnnotationModel(editor_.getEditorInput()));
-        //refresh the view later and these deleted markers should disappear
-        //Use common shared variable for markerID
-		//String markerID = "org.eclipse.ptp.pldt.mpi.analysis.mpiBarrierMatchingSetMarker";
- 		MPIArtifactMarkingVisitor visitor = new MPIArtifactMarkingVisitor(IDs.matchingSetMarkerID);
-		
-        /* Display all matched barriers */
- 		// create the markers for all the matched barriers
- 		String parentName="BarrierSetName"; // change to something that makes sense //$NON-NLS-1$
-        for(Iterator i = barrier.getMatchingSet().iterator(); i.hasNext();){
-        	BarrierInfo matchedBar = (BarrierInfo)i.next();
-        	showNode(matchedBar.getFunc().getFunctionNameExpression(), "org.eclipse.ptp.pldt.mpi.analysis.matchset"); //$NON-NLS-1$
-            ScanReturn sr = new ScanReturn();
-            /*
-        	SourceInfo sourceInfo = matchedBar.getSourceInfo();	
-        	int col=1;
-        	String filename=matchedBar.getFileName();
-        	int line=sourceInfo.getStartingLine();
-        	String fn=matchedBar.getEnclosingFunc();
-        	*/
-        	//ArtifactWithParent a = new ArtifactWithParent(filename, line, col, fn,"Artifact Call",sourceInfo,parentName);
-        	//sr.addArtifact(a);
-        	visitor.visitFile(matchedBar.getResource(), sr.getArtifactList());
-        }
-        // Done creating markers, now show the view
-        ViewActivator.activateView(IDs.matchingSetViewID);
-    }
-    
-    protected BarrierInfo findSelectedBarrier(String filename, int offset){
-    	BarrierTable table = results_.getBarrierTable();
-    	for(Enumeration e = table.getTable().elements(); e.hasMoreElements();){
-    		ArrayList list = (ArrayList)e.nextElement();
-    		for(Iterator i = list.iterator(); i.hasNext();){
-    			BarrierInfo bar = (BarrierInfo)i.next();
-    			if(traceOn)System.out.println(bar.getFileName());
-    			if(traceOn)System.out.println(bar.getSourceInfo().getStart());
-    			if(!bar.getFileName().endsWith(filename)) continue;
-    			if(bar.getSourceInfo().getStart() == offset)
-    				return bar;
-    		}
-    	}
-    	return null;
-    }
-    
-    /* Don Pazel's code Utility.removeConcurrencyMarkers() */
-    protected void removeMarkers(IAnnotationModel am)
-    {
-        LinkedList ais = new LinkedList();
-        for(Iterator ai=am.getAnnotationIterator(); ai.hasNext();) { ais.add(ai.next()); }
-        for(Iterator it=ais.iterator(); it.hasNext();) {
-            Annotation a = (Annotation)it.next();
-            if (a.getType().equals("org.eclipse.ptp.pldt.mpi.analysis.matchset")) { //$NON-NLS-1$
-                am.removeAnnotation(a);
-            }
-        }
-    }
-    
-    protected void showNode(IASTNode node, String markerType)
-    {
-        Utility.Location l = Utility.getLocation(node); 
-
-        
-        IAnnotationModel am = editor_.getDocumentProvider().getAnnotationModel(editor_.getEditorInput());
-        
-        // We need to add an annotation type to the annotation painter (see SourceViewerDecorationSupport)
-        Annotation a = new Annotation(markerType, true, "Hi"); //$NON-NLS-1$
-        int end = l.high_-l.low_+1;
-        Position   p = new Position(l.low_, end);
-        am.addAnnotation(a, p);
-    }
-    
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/ArtifactWithParent.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/ArtifactWithParent.java
deleted file mode 100644
index 45c82f6..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/ArtifactWithParent.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis.view;
-
-import org.eclipse.ptp.pldt.common.Artifact;
-import org.eclipse.ptp.pldt.common.util.SourceInfo;
-
-public class ArtifactWithParent extends Artifact {
-	private int parentID;
-	private int myID;
-	private String name;
-	private int index;
-
-	public ArtifactWithParent(String fileName, int line, int column, String funcName, String desc,  /*String primaryFileName,*/
-			SourceInfo sourceInfo, int parentID, int myID, String name, int index) {
-		super(fileName, line, column, funcName, sourceInfo);
-		this.parentID = parentID;
-		this.myID = myID;
-		this.name = name;
-		this.index = index;
-	}
-
-	public int getParentID() {
-		return parentID;
-	}
-	
-	public int getMyID(){
-		return myID;
-	}
-	
-	public String getMyName() {
-		return name;
-	}
-	
-	public int getIndex(){
-		return index;
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/BarrierArtifacts.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/BarrierArtifacts.java
deleted file mode 100644
index 737c141..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/BarrierArtifacts.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis.view;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.util.SourceInfo;
-import org.eclipse.ptp.pldt.mpi.analysis.IDs;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.MPICallGraphNode;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.BarrierTable.BarrierInfo;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraph;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraphNode;
-
-public class BarrierArtifacts {
-	private ICallGraph CG_;
-	private ScanReturn scanReturn_;
-	private MPIArtifactMarkingVisitor visitor_;
-	private String markerID = IDs.barrierMarkerID;
-	public BarrierArtifacts(ICallGraph cg, MPIArtifactMarkingVisitor visitor){
-		CG_ = cg;
-		visitor_ = visitor;
-	}
-	
-	public void run(){
-		/* first clear all existing markers */
-		IWorkspaceRoot wsResource = ResourcesPlugin.getWorkspace().getRoot();
-		try {
-			int depth = IResource.DEPTH_INFINITE;
-			wsResource.deleteMarkers(markerID, false, depth);
-
-        } catch (CoreException e) {
-            System.out.println("RM: exception deleting markers."); //$NON-NLS-1$
-            e.printStackTrace();
-        }
-        
-		for(ICallGraphNode n =  CG_.topEntry(); n != null; n = n.topNext()){
-			MPICallGraphNode node = (MPICallGraphNode)n;
-			List<BarrierInfo> barriers = node.getAllBarriers();
-			scanReturn_ = new ScanReturn();
-			for(Iterator<BarrierInfo> i = barriers.iterator(); i.hasNext();){
-				BarrierInfo bar = i.next();
-				SourceInfo sourceInfo = bar.getSourceInfo();
-				ArtifactWithParent awp = new ArtifactWithParent(node.getFileName(), 
-						sourceInfo.getStartingLine(), 1, node.getFuncName(), 
-						"Artifact Call", sourceInfo, 0, 0, "", //$NON-NLS-1$ //$NON-NLS-2$
-						bar.getID()-4);
-				scanReturn_.addArtifact(awp);
-			}
-			visitor_.visitFile(node.getResource(), scanReturn_.getArtifactList());
-		}
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/MPIArtifactMarkingVisitor.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/MPIArtifactMarkingVisitor.java
deleted file mode 100644
index 631c3b5..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/MPIArtifactMarkingVisitor.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,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.pldt.mpi.analysis.view;
-
-import java.util.Map;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.pldt.common.Artifact;
-import org.eclipse.ptp.pldt.common.ArtifactMarkingVisitor;
-import org.eclipse.ptp.pldt.mpi.analysis.IDs;
-import org.eclipse.ui.texteditor.MarkerUtilities;
-
-public class MPIArtifactMarkingVisitor extends ArtifactMarkingVisitor{
-
-	protected static final boolean traceOn = false;
-	
-	public MPIArtifactMarkingVisitor(String markerID){
-		super(markerID);
-	}
-	
-	public String getMarkerID() {return markerID_;}
-	
-	/**
-	 *  Visit file, but don't remove existing markers 
-	 *  */
-    public boolean visitFile(IResource resource, Artifact[] artifacts)
-    {
-        try {
-            if(traceOn) System.out.println("ArtifactMarkingVisitor.visitFile: " + resource.getName()); //$NON-NLS-1$
-            //removeMarkers(resource, this.markerID_);
-            int numArtifacts=artifactManager_.getArtifacts().length;
-            if(traceOn)System.out.println("numArtifacts: "+numArtifacts); //$NON-NLS-1$
-            
-            String fn = resource.getProjectRelativePath().toString();
-
-            if (artifacts != null) {
-                createMarkers(resource, fn, artifacts);
-            }
-        } catch (CoreException e) {
-            e.printStackTrace();
-        }
-        return true;
-
-    }
-
-	/**
-	 * Create the marker for the artifact; like the super class 
-     * version of this, but also adds the parent name from ArtifactWithParent - for use in the tree view
-	 * @param resource
-	 * @param artifact
-	 * @param fn
-	 * @throws CoreException
-	 */
-	protected void createArtifactMarker(IResource resource, Artifact artifact, String fn) throws CoreException
-	{
-	    if (traceOn) System.out.println("Artifact desc=" + artifact.getShortName() + "  fn=" + fn); //$NON-NLS-1$ //$NON-NLS-2$
-	    Map attrs = createCommonMarkerAttrs(resource, artifact, fn);
-	    // message attribute will be used for hover over editor location
-	    attrs.put(IMarker.MESSAGE, artifact.getShortName());
-	    
-	    // Get the parent name out of the artifact, to place in the marker
-	    ArtifactWithParent awp=(ArtifactWithParent)artifact;
-
-    	attrs.put(IDs.parentIDAttr, new Integer(awp.getParentID()));
-    	attrs.put(IDs.myIDAttr, new Integer(awp.getMyID()));
-    	attrs.put(IDs.myNameAttr, awp.getMyName());
-    	attrs.put(IDs.myIndexAttr, new Integer(awp.getIndex()));
-	    
-	    // create the marker all at once, so get ONLY a single resourceChange event.
-	    MarkerUtilities.createMarker(resource, attrs, this.markerID_);  // 154
-	    if (traceOn)
-	        System.out.println("marker created: for " + fn + " - " + artifact.getShortName() + " line " //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	                + artifact.getLine() + " start " + artifact.getSourceInfo().getStart() + " end " //$NON-NLS-1$ //$NON-NLS-2$
-	                + artifact.getSourceInfo().getEnd());
-	    
-	    artifactManager_.addArtifactToHash(artifact);
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/MPIBarrierMatchingSetView.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/MPIBarrierMatchingSetView.java
deleted file mode 100644
index 3b86a38..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/MPIBarrierMatchingSetView.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis.view;
-
-//import org.eclipse.ptp.pldt.common.views.SimpleTreeTableMarkerView;
-import org.eclipse.ptp.pldt.mpi.analysis.Activator;
-import org.eclipse.ptp.pldt.mpi.analysis.IDs;
-import org.eclipse.ptp.pldt.mpi.analysis.messages.Messages;
-
-
-/**
- * Show the members of a barrier matching set, in a tree table view.
- * 
- * TODO: try to use  class from 'common' package instead
- */
-public class MPIBarrierMatchingSetView extends SimpleTreeTableMarkerView {
-	public MPIBarrierMatchingSetView() {
-
-		super(Activator.getDefault(), "FunctionName", Messages.MPIBarrierMatchingSetView_matchingSetArtifacts,  //$NON-NLS-1$
-				Messages.MPIBarrierMatchingSetView_indexNum, IDs.matchingSetMarkerID /*,  common ver needs:"parent"*/ );
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/MPIBarrierView.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/MPIBarrierView.java
deleted file mode 100644
index b9b7477..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/MPIBarrierView.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis.view;
-
-//import org.eclipse.ptp.pldt.common.views.SimpleTableView;
-import org.eclipse.ptp.pldt.mpi.analysis.Activator;
-import org.eclipse.ptp.pldt.mpi.analysis.IDs;
-import org.eclipse.ptp.pldt.mpi.analysis.messages.Messages;
- /**
-  * View to show list of barriers 
-  * 
-  * TODO: this should use the SimpleTableView from the 'common' package,
-  * which I'm hoping the other view can eventually do as well (reuse view
-  * classes from that package)
-  * TODO: replace column header from 'common' package view class
-  */
-//public class MPIBarrierView extends SimpleTableView {// use common class
-public class MPIBarrierView extends SimpleTableBarrierView {//original
-	public MPIBarrierView() {
-
-		super(Activator.getDefault(), Messages.MPIBarrierView_function, Messages.MPIBarrierView_barrierArtifacts,
-				Messages.MPIBarrierView_indexNo, IDs.barrierMarkerID);
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/MPIErrorView.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/MPIErrorView.java
deleted file mode 100644
index 156755b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/MPIErrorView.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,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.pldt.mpi.analysis.view;
-
-import org.eclipse.ptp.pldt.mpi.analysis.Activator;
-import org.eclipse.ptp.pldt.mpi.analysis.IDs;
-import org.eclipse.ptp.pldt.mpi.analysis.messages.Messages;
-
-/**
- * View to show list of barrier errors [new view architecture]
- * 
- */
-public class MPIErrorView extends SimpleTreeTableMarkerView {
-	public MPIErrorView() {
-
-		super(Activator.getDefault(), "FunctionName", Messages.MPIErrorView_matchingSetArtifacts, "IndexNum", //$NON-NLS-1$ //$NON-NLS-3$
-				IDs.errorMarkerID/* common needs:, IDs.parentIDAttr*/);
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/MatchingSet.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/MatchingSet.java
deleted file mode 100644
index ebbb1b9..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/MatchingSet.java
+++ /dev/null

@@ -1,106 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis.view;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.util.SourceInfo;
-import org.eclipse.ptp.pldt.common.util.ViewActivater;
-import org.eclipse.ptp.pldt.mpi.analysis.IDs;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.BarrierTable;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.BarrierTable.BarrierInfo;
-
-public class MatchingSet {
-	protected BarrierTable btable_ = null;
-	
-	public MatchingSet(BarrierTable table){
-		btable_ = table;
-	}
-	
-	public void run(){
-		IWorkspaceRoot wsResource = ResourcesPlugin.getWorkspace().getRoot();
-		try {
-			int depth = IResource.DEPTH_INFINITE;
-			wsResource.deleteMarkers(IDs.matchingSetMarkerID, false, depth);
-
-        } catch (CoreException e) {
-            System.out.println("RM: exception deleting markers."); //$NON-NLS-1$
-            e.printStackTrace();
-        }
-		
-		MPIArtifactMarkingVisitor visitor = new MPIArtifactMarkingVisitor(IDs.matchingSetMarkerID);
-		int count = 0;
-		
-		// create the markers for all the matched barriers
-		for(Enumeration e = btable_.getTable().elements(); e.hasMoreElements();){
-			ArrayList barrierList = (ArrayList)e.nextElement();
-			for(Iterator ii = barrierList.iterator(); ii.hasNext();){
-				BarrierInfo barrier = (BarrierInfo)ii.next();
-				count ++;
-				int parentID = count;
-				String name = "Barrier " + (barrier.getID()-4) + " (" + barrier.getMatchingSet().size() + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				// create a marker for each parent(barrier)
-				ScanReturn sr = new ScanReturn();
-	        	SourceInfo sourceInfo = barrier.getSourceInfo();
-	        	String filename = barrier.getFileName();
-	        	int line = sourceInfo.getStartingLine();
-	        	String fn = barrier.getEnclosingFunc();
-	        	ArtifactWithParent a = new ArtifactWithParent(filename, line, 1, fn,
-	        			"Artifact Call", sourceInfo, 0, parentID, name, barrier.getID()-4); //$NON-NLS-1$
-	        	sr.addArtifact(a);
-	        	visitor.visitFile(barrier.getResource(), sr.getArtifactList());
-				
-				for(Iterator i = barrier.getMatchingSet().iterator(); i.hasNext();){
-					BarrierInfo matchedBar = (BarrierInfo)i.next();
-					count ++;
-					int myID = count;
-					name = "Barrier " + (matchedBar.getID()-4); //$NON-NLS-1$
-					sr = new ScanReturn();
-		        	sourceInfo = matchedBar.getSourceInfo();
-		        	filename = matchedBar.getFileName();
-		        	line = sourceInfo.getStartingLine();
-		        	fn = matchedBar.getEnclosingFunc();
-		        	a = new ArtifactWithParent(filename, line, 1, fn,"Artifact Call", //$NON-NLS-1$
-		        			sourceInfo, parentID, myID, name, matchedBar.getID()-4);
-		        	sr.addArtifact(a);
-		        	visitor.visitFile(matchedBar.getResource(), sr.getArtifactList());
-		        }
-		        
-			}
-		}
-        // Done creating markers, now show the view
-        ViewActivater.activateView(IDs.matchingSetViewID);
-	}
-	
-	/*
-	   protected void showNode(IASTNode node, String markerType)
-	    {
-	        Utility.Location l = Utility.getLocation(node);
-	        
-	        IAnnotationModel am = editor_.getDocumentProvider().getAnnotationModel(editor_.getEditorInput());
-	        
-	        // We need to add an annotation type to the annotation painter (see SourceViewerDecorationSupport)
-	        Annotation a = new Annotation(markerType, true, "Hi");
-	        int end = l.high_-l.low_+1;
-	        Position   p = new Position(l.low_, end);
-	        am.addAnnotation(a, p);
-	    }
-	*/
-	
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/ShowErrors.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/ShowErrors.java
deleted file mode 100644
index e2f6778..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/ShowErrors.java
+++ /dev/null

@@ -1,174 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis.view;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.util.SourceInfo;
-import org.eclipse.ptp.pldt.common.util.ViewActivator;
-import org.eclipse.ptp.pldt.mpi.analysis.IDs;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.BarrierTable.BarrierInfo;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.MPIBarrierMatching.ErrorMessage;
-import org.eclipse.ptp.pldt.mpi.analysis.analysis.MPIBarrierMatching.PathNode;
-import org.eclipse.ptp.pldt.mpi.analysis.messages.Messages;
-
-/**
- * For the list of ErrorMessage objects given to this class,
- * iterate through them and create parent and child node groups of
- * markers for each error.
- *
- */
-public class ShowErrors {
-	protected List<ErrorMessage> errors_;
-	protected int counter = 0;
-	
-	public ShowErrors(List<ErrorMessage> errors){
-		this.errors_ = errors;
-	}
-	/**
-	 * 
-	 * @return true if errors found
-	 */
-
-	public boolean run(){
-		boolean foundErrors=false;
-		IWorkspaceRoot wsResource = ResourcesPlugin.getWorkspace().getRoot();
-		try {
-			int depth = IResource.DEPTH_INFINITE;
-			wsResource.deleteMarkers(IDs.errorMarkerID, false, depth);
-
-        } catch (CoreException e) {
-            System.out.println("RM: exception deleting markers."); //$NON-NLS-1$
-            e.printStackTrace();
-        }
-		
-        //TODO: change this visitor
-		MPIArtifactMarkingVisitor visitor = new MPIArtifactMarkingVisitor(IDs.errorMarkerID);
-		
-		/* Two kinds of Artifacts: 
-		 * (1) errorous conditions
-		 * (2) barriers in counter examples
-		 */
-		
-		for(Iterator<ErrorMessage> i = errors_.iterator(); i.hasNext();){
-			ErrorMessage err = i.next();
-			
-			/* Error condition */
-			counter ++;
-			int condID = counter;
-			ScanReturn sr = new ScanReturn();
-			String funcName = err.getFuncName();
-			String fileName = err.getFileName();
-			SourceInfo sourceInfo = err.getSourceInfo();
-			ArtifactWithParent ea = new ArtifactWithParent(fileName, 
-					sourceInfo.getStartingLine(), 1, 
-					funcName, "Erroneous Condition", sourceInfo, 0, condID, "Error", 0); //$NON-NLS-1$ //$NON-NLS-2$
-			sr.addArtifact(ea);
-        	visitor.visitFile(err.getResource(), sr.getArtifactList());
-        	
-        	/* Path 1 (and 2) */
-        	counter ++;
-        	int path1ID = counter;
-        	String path1name = (String)null;
-        	if(err.getLength1() == -1){
-        		if(err.getPath2() != null)
-        			path1name = Messages.ShowErrors_path1DynamicNumberOfBarriers;
-        		else
-        			path1name = Messages.ShowErrors_loopDynamicNumberOfBarriers;
-        	} else {
-        		path1name = Messages.ShowErrors_path1 + err.getLength1() + Messages.ShowErrors_barriers;
-        	}
-        	sr = new ScanReturn();
-        	ea = new ArtifactWithParent("", 0, 0, "", Messages.ShowErrors_counterExample, //$NON-NLS-1$ //$NON-NLS-2$
-        			err.getPath1SourceInfo(), condID, path1ID, path1name, 0);
-        	sr.addArtifact(ea);
-        	
-        	int path2ID = 0;
-        	if(err.getPath2() != null){
-	    		counter ++;
-	    		path2ID = counter;
-	           	String path2name = (String)null;
-	        	if(err.getLength2() == -1){
-	        		path2name = Messages.ShowErrors_path2dynamicNumberOfBarriers;
-	        	} else {
-	        		path2name = Messages.ShowErrors_path2 + err.getLength2() + Messages.ShowErrors_barriers;
-	        	}
-	    		ea = new ArtifactWithParent("", 0, 0, "", "Counter Example", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	    				err.getPath2SourceInfo(), condID, path2ID, path2name, 0);
-	    		sr.addArtifact(ea);
-	        	}
-        	visitor.visitFile(err.getResource(), sr.getArtifactList());
-
-        	/* Counter example content */
-        	for(Iterator<PathNode> ii = err.getPath1().iterator(); ii.hasNext();){
-        		PathNode pn = ii.next();
-        		BarrierInfo barrier = pn.getBarrier();
-        		counter ++;
-				sr = new ScanReturn();
-	        	sourceInfo = barrier.getSourceInfo();
-	        	fileName = barrier.getFileName();
-	        	funcName = barrier.getEnclosingFunc();
-	        	String barrierName = (String)null;
-	        	// BRT Note! This is where the barrier matching set labels are.
-	        	// Consider changing the parent node to "Barrier Set"
-	        	if(pn.isRepeat())
-	        		barrierName = Messages.ShowErrors_barrier_ + (barrier.getID() -4) + "(*)"; //$NON-NLS-2$ //$NON-NLS-1$
-	        	else
-	        		barrierName = Messages.ShowErrors_barrier_ + (barrier.getID() -4);
-	        	ArtifactWithParent a = new ArtifactWithParent(fileName,
-	        			sourceInfo.getStartingLine(), 1, funcName, 
-	        			Messages.ShowErrors_barrier, sourceInfo, path1ID, counter, barrierName, 
-	        			barrier.getID()-4);
-	        	sr.addArtifact(a);
-	        	visitor.visitFile(barrier.getResource(), sr.getArtifactList());
-        	}
-        	
-        	if(err.getPath2() == null) continue;
-        	for(Iterator<PathNode> ii = err.getPath2().iterator(); ii.hasNext();){
-        		PathNode pn = ii.next();
-        		BarrierInfo barrier = pn.getBarrier();
-        		counter ++;
-				sr = new ScanReturn();
-	        	sourceInfo = barrier.getSourceInfo();
-	        	fileName = barrier.getFileName();
-	        	funcName = barrier.getEnclosingFunc();
-	        	String barrierName = (String)null;
-	        	if(pn.isRepeat())
-	        		barrierName = Messages.ShowErrors_barrier_ + (barrier.getID() -4) + "(*)"; //$NON-NLS-2$ //$NON-NLS-1$
-	        	else
-	        		barrierName = Messages.ShowErrors_barrier_ + (barrier.getID() -4);
-	        	ArtifactWithParent a = new ArtifactWithParent(fileName,
-	        			sourceInfo.getStartingLine(), 1, funcName,
-	        			Messages.ShowErrors_barrier, sourceInfo, path2ID, counter, barrierName,
-	        			barrier.getID()-4);
-	        	sr.addArtifact(a);
-	        	visitor.visitFile(barrier.getResource(), sr.getArtifactList());
-        	}
-		}
-
-        // Done creating markers, now show the views
-        ViewActivator.activateView(IDs.matchingSetViewID);
-        if(errors_.size()>0) {
-        	ViewActivator.activateView(IDs.errorViewID);
-        	foundErrors=true;
-        }
-        return foundErrors;
-        
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/SimpleTableBarrierView.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/SimpleTableBarrierView.java
deleted file mode 100644
index 53a6dc8..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/SimpleTableBarrierView.java
+++ /dev/null

@@ -1,1630 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis.view;
-
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IMarkerDelta;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.ptp.pldt.common.ArtifactManager;
-import org.eclipse.ptp.pldt.common.CommonPlugin;
-import org.eclipse.ptp.pldt.common.IArtifact;
-import org.eclipse.ptp.pldt.mpi.analysis.IDs;
-import org.eclipse.ptp.pldt.mpi.analysis.messages.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.ui.texteditor.MarkerUtilities;
-
-/**
- * TODO: This is basically a copy of class from common plugin
- * (org.eclipse.ptp.pldt.common); need to work toward replacing this with that
- * one - however some changes have been made to this one
- * 
- */
-public class SimpleTableBarrierView extends ViewPart {
-	protected TableViewer viewer;
-
-	protected Action infoAction;
-
-	private Action filterAction;
-
-	private Action doubleClickAction;
-
-	private static final boolean traceOn = false;
-
-	private static final boolean traceStatusLine = false;
-
-	protected ViewerSorter nameSorter;
-
-	protected GenericSorter lineNoSorter;
-
-	protected FilenameSorter filenameSorter;
-
-	protected GenericSorter orderSorter; // by "icon"
-
-	protected GenericSorter nameArtifactSorter;
-
-	protected GenericSorter constructSorter;
-
-	private IMarker selectedMarker_ = null;
-
-	/**
-	 * List of artifacts that were changed due to some action upon them in the
-	 * view (currently unused)
-	 */
-	protected StackList changedArts_ = new StackList();
-
-	/**
-	 * List of markers that were involved in a change on the the associated
-	 * artifact due to some action upon them here in the view (currently unused)
-	 */
-	protected StackList changedMarkers_ = new StackList();
-
-	protected UpdateVisitor visitor_ = new UpdateVisitor();
-
-	/**
-	 * Be consistent about what we call these things; generic values (can be)
-	 * replaced on ctor. <br>
-	 * These are read from plugin.xml if not passed on ctor
-	 */
-	protected String thingname_ = Messages.SimpleTableBarrierView_artifact;
-
-	protected String thingnames_ = Messages.SimpleTableBarrierView_artifacts;
-
-	private String columnName_ = Messages.SimpleTableBarrierView_value;
-
-	private AbstractUIPlugin thePlugin_;
-
-	private String iconName_ = "icons/sample.gif"; //$NON-NLS-1$
-
-	private String viewName_;
-
-	private String markerID_;
-
-	protected ArtifactManager artifactManager_;
-
-	private String[] columnNames_;
-
-	private String[] markerAttrNames_;
-
-	/**
-	 * The ID used in the marker for the unique ID for each artifact. Enables
-	 * mapping back to the Artifact object if necessary.
-	 */
-	protected String uniqueID_ = "uniqueID"; //$NON-NLS-1$
-
-	/**
-	 * The ID used in the marker for the extra column of information (last
-	 * column)
-	 */
-	protected String columnID_ = "constructType"; // id for (variable) //$NON-NLS-1$
-
-	/** Marker ID for artifact name - e.g. API name, pragma name, etc. */
-	protected static final String NAME = "name"; //$NON-NLS-1$
-
-	/** Marker ID for storage of the filename in which the artifact is found */
-	protected static final String FILENAME = "filename"; //$NON-NLS-1$
-
-	/**
-	 * Marker id for storage of line number on which the artifact is found.
-	 * Reuse of default ID used by IMarker, repeated here for ease of use and
-	 * for clarity that THIS is the marker ID for line number.
-	 */
-	protected static final String LINE = IMarker.LINE_NUMBER;
-
-	/** Marker id for storage of additional information about the artifact */
-	protected static final String DESCRIPTION = "description"; //$NON-NLS-1$
-
-	public static final int NONE = 0;
-
-	public static final int FUNCTION_CALL = 1;
-
-	public static final int CONSTANT = 2;
-
-	/** types of constructs, for the default case */
-	public static final String[] CONSTRUCT_TYPE_NAMES = { Messages.SimpleTableBarrierView_none, Messages.SimpleTableBarrierView_functionCall, Messages.SimpleTableBarrierView_constant };
-
-	/**
-	 * Simple Artifact Table View constructor
-	 * <p>
-	 * Everything can be null, and defaults will be taken, or read from
-	 * plugin.xml for the view.
-	 * <p>
-	 * Note: if a null plugIn instance is provided, the default plugin (this
-	 * one) will not be able to find resources (e.g. icon images) if the derived
-	 * class is in its own plug-in, and its icons are, too.
-	 */
-	public SimpleTableBarrierView(AbstractUIPlugin thePlugin, String thingname, String thingnames, String columnName,
-			String markerID) {
-
-		if (thePlugin == null) {
-			thePlugin_ = CommonPlugin.getDefault();
-		} else {
-			this.thePlugin_ = thePlugin;
-		}
-		if (thingname != null)
-			this.thingname_ = thingname;
-		if (thingnames != null)
-			this.thingnames_ = thingnames;
-		if (columnName != null) {
-			this.columnName_ = columnName; // last column named by subclass
-		}
-		this.markerID_ = markerID;// if null, will use view id.
-
-		findViewInfo();
-
-	}
-
-	/**
-	 * Simple table view with an arbitrary number of extra columns
-	 * 
-	 * @param thePlugin
-	 * @param thingname
-	 * @param thingnames
-	 * @param attrNames
-	 *            list of marker attributes, for which the column values will be
-	 *            extractd
-	 * @param colNames
-	 *            list of Column names, used as headers for the values found in
-	 *            the marker attributes
-	 * @param markerID_
-	 */
-	public SimpleTableBarrierView(AbstractUIPlugin thePlugin, String thingname, String thingnames, String[] attrNames,
-			String[] colNames, String markerID) {
-		this(thePlugin, thingname, thingnames, null, markerID);
-		columnNames_ = colNames;
-		columnName_ = null;// set this so we can tell we are using array of
-							// attrs/cols
-		markerAttrNames_ = attrNames;
-
-	}
-
-	/**
-	 * Ctor that uses defaults for everything (testing? theoretically, this
-	 * should work, and should be reusable since info that must be unique is
-	 * read from from plugin.xml.)
-	 * 
-	 */
-	public SimpleTableBarrierView() {
-		this(null, null, null, null, null);
-	}
-
-	/**
-	 * Find info from the view info in the manifest. This includes the icon
-	 * name, the view id (used as marker id if none given on ctor), and
-	 * constructs an artifact manager for this view's artifact objects
-	 * 
-	 */
-	protected void findViewInfo() {
-		String classname = this.getClass().getName();
-		// try to find the icon specified in the plugin.xml for this
-		// extension/view
-		IExtension[] ext = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.ui.views").getExtensions(); //$NON-NLS-1$
-		for (int i = 0; i < ext.length; i++) {
-			IExtension extension = ext[i];
-			IConfigurationElement[] ces = extension.getConfigurationElements();
-			for (int j = 0; j < ces.length; j++) {
-				IConfigurationElement cElement = ces[j];
-				String iconName = cElement.getAttribute("icon"); //$NON-NLS-1$
-				String classN = cElement.getAttribute("class"); //$NON-NLS-1$
-				String name = cElement.getAttribute("name"); //$NON-NLS-1$
-				if (classname.equals(classN)) {
-					if (iconName != null) {
-						iconName_ = iconName;
-					}
-					this.viewName_ = name;
-					if (markerID_ == null) {
-						// use plugin id for marker id, if not specified
-						markerID_ = cElement.getAttribute("id"); //$NON-NLS-1$
-					}
-					artifactManager_ = ArtifactManager.getManager(markerID_);
-					if (artifactManager_ == null) {
-						artifactManager_ = new ArtifactManager(markerID_);
-					}
-				}
-
-			}
-
-		}
-	}
-
-	/**
-	 * It might be useful for subclasses to override this, to say which
-	 * filenames should allow the action "run analysis" to create new artifacts
-	 * and thus new markers. <br>
-	 * This is a default implementation
-	 * 
-	 * @param filename
-	 * @return
-	 */
-	public boolean validForAnalysis(String filename) {
-		// return MpiUtil.validForAnalysis(filename);
-		return true;
-
-	}
-
-	/**
-	 * The content provider class is responsible for providing objects to the
-	 * view. It can wrap existing objects in adapters or simply return objects
-	 * as-is. These objects may be sensitive to the current input of the view,
-	 * or ignore it and always show the same content (like Task List, for
-	 * example).
-	 */
-	class ViewContentProvider implements IStructuredContentProvider, IResourceChangeListener {
-		private IResource input;
-
-		private boolean hasRegistered = false;
-
-		public void inputChanged(Viewer v, Object oldInput, Object newInput) {
-			// could use this to change the list to just artifacts from one
-			// resource,
-			// etc...
-			// could cache viewer here this.viewer=v;
-			if (traceOn)
-				System.out.println("ATV inputChanged()..."); //$NON-NLS-1$
-			// if this is the first time we have been given an input
-			if (!hasRegistered) {
-				// add me as a resource change listener so i can refresh at
-				// least when markers are changed
-				// POST_CHANGE: only want event notifications for after-the-fact
-				ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
-				hasRegistered = true;
-				if (traceOn)
-					System.out.println("ATV: Registered RCL for ViewContentProvider"); //$NON-NLS-1$
-			}
-			if (newInput instanceof IResource) {
-				this.input = (IResource) newInput;
-			}
-
-		}
-
-		public void dispose() {
-			if (traceOn)
-				System.out.println("ATV.ViewContentProvider.dispose()"); //$NON-NLS-1$
-			ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-
-		}
-
-		/**
-		 * Get the list of objects to populate this view.
-		 */
-		public Object[] getElements(Object parent) {
-			Object[] objs = null;
-			try {
-				String id = markerID_;
-				if (input == null) {
-					if (traceOn)
-						System.out.println("input is null in getElements..."); //$NON-NLS-1$
-				}
-				// use the cached input object instead of querying from
-				// workspace
-				// objs =
-				// ResourcesPlugin.getWorkspace().getRoot().findMarkers(id,
-				// false, IResource.DEPTH_INFINITE);
-				objs = input.findMarkers(id, false, IResource.DEPTH_INFINITE);
-			} catch (CoreException e) {
-				System.out.println("ATV, exception getting model elements (markers for Table view)"); //$NON-NLS-1$
-				e.printStackTrace();
-			}
-			if (traceOn)
-				System.out.println("ATV.get---Elements, found " + objs.length + " markers"); //$NON-NLS-1$ //$NON-NLS-2$
-			return objs;
-
-		}
-
-		/**
-		 * react to a resource change event
-		 * 
-		 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
-		 */
-
-		public void resourceChanged(IResourceChangeEvent event) {
-			if (traceOn)
-				System.out.println("-----------------resourceChanged()"); //$NON-NLS-1$
-			final IResourceDelta delta = event.getDelta();
-			if (traceOn)
-				printResourcesChanged(delta, 1);
-			// remove the following when resource delta visitor does it all?
-			Control ctrl = viewer.getControl();
-			if (ctrl != null && !ctrl.isDisposed()) {
-				ctrl.getDisplay().syncExec(new Runnable() {
-					public void run() {
-						try {
-							if (traceOn)
-								System.out.println("viewer.update ea mkr in delta-- from resourceChanged()..."); //$NON-NLS-1$
-							if (traceOn)
-								System.out.println("----processResourceChangeDelta()..."); //$NON-NLS-1$
-							processResourceChangeDelta(delta);
-							if (traceOn)
-								System.out.println("----END processResourceChangeDelta()..."); //$NON-NLS-1$
-							if (traceOn)
-								System.out.println("viewer.refresh()"); //$NON-NLS-1$
-							viewer.refresh();
-
-						} catch (Exception e) {
-							System.out.println("ATV: Exception refreshing viewer: " + e); //$NON-NLS-1$
-							e.printStackTrace();
-						}
-
-					}
-				});
-			}
-			if (traceOn)
-				System.out.println("-----------------END resourceChanged()\n"); //$NON-NLS-1$
-
-		}
-
-		/**
-		 * Debugging statement help - prints the events, indented by nesting
-		 * level
-		 * 
-		 * @param delta
-		 * @param indent
-		 */
-		private void printResourcesChanged(IResourceDelta delta, int indent) {
-			printOneResourceChanged(delta, indent);
-			IResourceDelta[] children = delta.getAffectedChildren();
-			for (int i = 0; i < children.length; i++)
-				printResourcesChanged(children[i], indent + 1);
-		}
-
-		/**
-		 * Some debugging statement help
-		 * 
-		 * @param delta
-		 * @param indent
-		 */
-		private void printOneResourceChanged(IResourceDelta delta, int indent) {
-			StringBuffer buf = new StringBuffer(80);
-			for (int i = 0; i < indent; i++)
-				buf.append("  "); //$NON-NLS-1$
-			switch (delta.getKind()) {
-			case IResourceDelta.ADDED:
-				buf.append("ADDED"); //$NON-NLS-1$
-				break;
-			case IResourceDelta.REMOVED:
-				buf.append("REMOVED"); //$NON-NLS-1$
-				break;
-			case IResourceDelta.CHANGED:
-				buf.append("CHANGED"); //$NON-NLS-1$
-				testDelta(delta);
-				break;
-			default:
-				buf.append("["); //$NON-NLS-1$
-				buf.append(delta.getKind());
-				buf.append("]"); //$NON-NLS-1$
-				break;
-			}
-			buf.append(" "); //$NON-NLS-1$
-			buf.append(delta.getResource());
-			System.out.println(buf);
-		}
-
-		/**
-		 * Show debugging info for a resource delta change
-		 * 
-		 * @param delta
-		 */
-		private void testDelta(IResourceDelta delta) {
-			// -- code from eclipse help:
-			// case IResourceDelta.CHANGED:
-			System.out.print(Messages.SimpleTableBarrierView_38);
-			System.out.print(delta.getFullPath());
-			System.out.println(" has changed."); //$NON-NLS-1$
-			int flags = delta.getFlags();
-			if ((flags & IResourceDelta.CONTENT) != 0) {
-				System.out.println("--> Content Change"); //$NON-NLS-1$
-			}
-			if ((flags & IResourceDelta.REPLACED) != 0) {
-				System.out.println("--> Content Replaced"); //$NON-NLS-1$
-			}
-			if ((flags & IResourceDelta.MARKERS) != 0) {
-				System.out.println("--> Marker Change"); //$NON-NLS-1$
-				// IMarkerDelta[] markers = delta.getMarkerDeltas();
-				// if interested in markers, check these deltas
-			}
-		}
-
-		/**
-		 * Process the resource change - just the delta
-		 * 
-		 * @param delta
-		 */
-		protected void processResourceChangeDelta(IResourceDelta delta) {
-			try {
-				delta.accept(visitor_);
-
-			} catch (CoreException e2) {
-				System.out.println("Error in PITV.processResourceChangeDelta().."); //$NON-NLS-1$
-				e2.printStackTrace();
-			}
-		}
-
-	} // end ViewContentProvider
-
-	/**
-	 * get artifact from marker
-	 * 
-	 * @param marker
-	 * @return
-	 */
-	protected IArtifact getSimpleArtifact(IMarker marker) {
-		String id = null;
-		IArtifact artifact = null;
-		try {
-			id = (String) marker.getAttribute(uniqueID_);
-			artifact = artifactManager_.getArtifact(id);
-
-		} catch (CoreException e) {
-			// e.printStackTrace();
-			System.out.println(e.getMessage() + " ... STV, CoreException getting artifact from hashMap; " + thingname_ + " id=" //$NON-NLS-1$ //$NON-NLS-2$
-					+ id);
-		} catch (NullPointerException ne) {
-			System.out.println(ne.getMessage() + " ... STV, NullPtrExcp getting artifact from hashMap;" + thingname_ + " id=" + id); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		return artifact;
-
-	}
-
-	/**
-	 * Get string representing the type of construct
-	 * 
-	 * @param marker
-	 * @return
-	 * @throws CoreException
-	 */
-	protected String getConstructStr(IMarker marker) throws CoreException {
-		Integer temp = (Integer) marker.getAttribute(columnID_);
-		if (temp != null) {
-			Integer constructType = temp;
-			return CONSTRUCT_TYPE_NAMES[constructType.intValue()];
-		} else
-			return " "; //$NON-NLS-1$
-	}
-
-	/**
-	 * 
-	 * ViewLabelProvider - provides the text and images for the artifacts in the
-	 * Table View
-	 * 
-	 * @author Beth Tibbitts
-	 * 
-	 * 
-	 */
-	class ViewLabelProvider extends LabelProvider implements ITableLabelProvider {
-		/**
-		 * Keep icons already created, and reuse the images
-		 */
-		private final HashMap iconHash = new HashMap();
-
-		private IArtifact artifact;
-
-		/**
-		 * provide what goes in each column; get the info from the marker
-		 */
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see
-		 * org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-		 */
-		@Override
-		public String getText(Object o) {
-			String temp = super.getText(o);
-			// System.out.println("Text: " + temp);
-			return temp;
-		}
-
-		/**
-		 * Determine the text to go in each column
-		 * 
-		 * @param obj
-		 *            the Marker (we hope) that goes on the current row
-		 * @param index
-		 *            the column number in the table
-		 * 
-		 */
-		public String getColumnText(Object obj, int index) {
-			if (obj == null) {
-				System.out.println("ATV: LabelProv obj is null; index=" + index); //$NON-NLS-1$
-				return "ATV obj null"; //$NON-NLS-1$
-			}
-			IMarker marker = (IMarker) obj;
-			try {
-				switch (index) {
-				case 0:
-					return ""; //$NON-NLS-1$
-				case 1:
-					String id = (String) marker.getAttribute(NAME);
-					return id;
-				case 2:
-
-					return (String) marker.getAttribute(FILENAME);
-				case 3:
-					String line = (marker.getAttribute(IMarker.LINE_NUMBER)).toString();
-
-					if (traceOn) { // all this is for debugging purposes so
-						artifact = getSimpleArtifact(marker);
-						String compLine = line + "-"; //$NON-NLS-1$
-						if (artifact == null) {
-							if (traceOn)
-								System.out.println("ATV getColumnText- null artifact"); //$NON-NLS-1$
-						} else {
-							int lineArtifact = artifact.getLine();
-							compLine = compLine + lineArtifact;
-						}
-						System.out.println("ATV.ViewLabelProvider gets marker line: mkr-artifact: " + compLine); //$NON-NLS-1$
-						showMarker(marker);
-					}
-					return line;
-				case 4:
-					Integer indexNum = (Integer) marker.getAttribute(IDs.myIndexAttr);
-					return indexNum.toString();
-				default:
-					String attrName = markerAttrNames_[index - 4];
-					String val = marker.getAttribute(attrName, ""); //$NON-NLS-1$
-					return val;
-				}
-			} catch (CoreException ce) {
-				// get this error 3x "Marker id: 999 not found." while deleting
-				// markers. why?
-				// Why is this even getting called, and why does it matter?
-				// String tmp = ce.getMessage();
-				// ce.printStackTrace();
-				return ("ATV error"); //$NON-NLS-1$
-			}
-		}
-
-		/**
-		 * Provide the image that goes in a column, if any (Note that a table
-		 * cell can contain both, an image and text, which will be displayed
-		 * side-by-side)
-		 * 
-		 * @param obj
-		 *            - the object we're getting the image for
-		 * @param index
-		 *            - the column that this image is to go in
-		 */
-		public Image getColumnImage(Object obj, int index) {
-			// we only put image icon in the first column
-			switch (index) {
-			case 0:
-				return getCustomImage(obj);
-			default:
-				return null;
-			}
-		}
-
-		/**
-		 * Get image for artifact. Note that different images could be used for
-		 * different types of artifacts. For now we have a single image.
-		 * 
-		 * @param obj
-		 *            the marker object that this artifact is represented by
-		 * @return image for marker
-		 *         <p>
-		 *         Note: if a null plugIn instance is provided on the view ctor,
-		 *         the default plugin (this one) will not be able to find
-		 *         resources (e.g. icon images) if the derived class is in its
-		 *         own plug-in, and its icons are, too.
-		 * 
-		 */
-		protected Image getCustomImage(Object obj) {
-			// if we've already created one of this type of icon, reuse it.
-			// Note: use ImageRegistry instead?
-			Image img = (Image) iconHash.get(iconName_);
-			if (img == null) {
-				Path path = new Path(iconName_);
-				// BRT make sure the specific plugin is being used here to find
-				// its OWN icons
-				URL url = thePlugin_.find(path);
-				ImageDescriptor id = ImageDescriptor.createFromURL(url);
-				img = id.createImage();
-				if (traceOn)
-					System.out.println("ATV: ***** created image for " + iconName_); //$NON-NLS-1$
-				iconHash.put(iconName_, img);// save for reuse
-			}
-			return img;
-		}
-
-		/**
-		 * Dispose of anything that would hang around rudely otherwise (such as
-		 * image objects from the icons)
-		 * 
-		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-		 */
-
-		@Override
-		public void dispose() {
-			if (traceOn)
-				System.out.println("ATV.ViewLabelProvider.dispose(); dispose of icon images"); //$NON-NLS-1$
-			for (Iterator iter = iconHash.values().iterator(); iter.hasNext();) {
-				Image img = (Image) iter.next();
-				img.dispose();
-			}
-			super.dispose();
-		}
-
-	}
-
-	/**
-	 * Default sorter for items - the order they were created, which tends to
-	 * group items with their source code locations
-	 * 
-	 * @author Beth Tibbitts
-	 */
-	class NameSorter extends ViewerSorter {
-	}
-
-	/**
-	 * Sort items by one or more of: artifact, filename, lineNo,
-	 * variableColumnName.<br>
-	 * The derived classes will implement combine() to say how the attributes
-	 * are combined to get the sort desired.
-	 * 
-	 * @author Beth Tibbitts
-	 */
-	abstract class GenericSorter extends ViewerSorter {
-		protected boolean ascending = true;
-
-		/**
-		 * Compare two items to determine sort order. Sort items by one or more
-		 * of: artifact name, then file, then line number, then construct
-		 */
-		@Override
-		public int compare(Viewer viewer, Object e1, Object e2) {
-			int result = 0;
-
-			int cat1 = category(e1);
-			int cat2 = category(e2);
-
-			if (cat1 != cat2)
-				return cat1 - cat2;
-
-			java.text.Collator collator = this.getCollator();
-
-			if (e1 instanceof IMarker) {
-				try {
-					IMarker m1 = (IMarker) e1;
-					IMarker m2 = (IMarker) e2;
-					String name1 = (String) m1.getAttribute(NAME);
-					String file1 = (String) m1.getAttribute(FILENAME);
-
-					String line1 = m1.getAttribute(LINE).toString();
-					String construct1 = getConstructStr(m1);
-					String sort1 = combine(name1, file1, line1, construct1);
-
-					String name2 = (String) m2.getAttribute(NAME);
-					String file2 = (String) m2.getAttribute(FILENAME);
-					String line2 = m2.getAttribute(LINE).toString();
-					String construct2 = getConstructStr(m2);
-					String sort2 = combine(name2, file2, line2, construct2);
-
-					if (ascending)
-						result = collator.compare(sort1, sort2);
-					else
-						result = collator.compare(sort2, sort1);
-
-					return result;
-				} catch (CoreException e) {
-					e.printStackTrace();
-				}
-			}
-			return 0;
-
-		}
-
-		/**
-		 * Combine name, file, and/or line number to provide the string to sort
-		 * by. Will be overridden by derived classes as needed
-		 * 
-		 * @param name
-		 * @param file
-		 * @param line
-		 * @param construct
-		 * @return always return null, subclass can choose to impl. this method.
-		 */
-		protected String combine(String name, String file, String line, String construct) {
-			return null;
-		}
-
-		/**
-		 * switch to this sorter. If it was already this sorter, then toggle the
-		 * sort order
-		 * 
-		 */
-		public void sort() {
-			// String className = this.getClass().getName();
-			// System.out.println(className+".sort() ascending="+ascending);
-			if (this == viewer.getSorter()) {
-				ascending = !ascending;
-				viewer.setSorter(null); // turn off to force re-sort
-			} else {
-				ascending = true;
-			}
-			viewer.setSorter(this);
-
-		}
-
-	}
-
-	/**
-	 * Sorter to sort by line number on which the SimpleArtifact is Found
-	 * 
-	 * @author Beth Tibbitts created
-	 * 
-	 * 
-	 */
-	class LineNoSorter extends GenericSorter {
-		/**
-		 * sort items by line number
-		 */
-		@Override
-		public int compare(Viewer viewer, Object e1, Object e2) {
-
-			int cat1 = category(e1);
-			int cat2 = category(e2);
-
-			if (cat1 != cat2)
-				return cat1 - cat2;
-
-			if (e1 instanceof IMarker) {
-				try {
-					IMarker m1 = (IMarker) e1;
-					Object tempObj = m1.getAttribute(LINE);
-					int line1 = 0;
-					int line2 = 0;
-					if (tempObj instanceof Integer) {
-						line1 = ((Integer) tempObj).intValue();
-						IMarker m2 = (IMarker) e2;
-						tempObj = m2.getAttribute(LINE);
-						// we assume if the first was Integer, this one is, too.
-						assert tempObj instanceof Integer;
-						line2 = ((Integer) tempObj).intValue();
-
-					}
-					int result = 0;
-					if (ascending)
-						result = line1 - line2;
-					else
-						result = line2 - line1;
-
-					return result;
-				} catch (CoreException e) {
-					e.printStackTrace();
-				}
-			}
-			return 0;
-
-		}
-	}
-
-	/**
-	 * Sort items by name
-	 * 
-	 * @author Beth Tibbitts
-	 * 
-	 * 
-	 */
-	class NameArtifactSorter extends GenericSorter {
-
-		/**
-		 * @param name
-		 * @param file
-		 * @param line
-		 * @param construct
-		 * @return BRT note: Sort isn't quite right: if name,filename identical,
-		 *         "10" would sort before "2" e.g.
-		 */
-		@Override
-		protected String combine(String name, String file, String line, String construct) {
-			final String delim = " - "; //$NON-NLS-1$
-			StringBuffer result = new StringBuffer(name);
-			result.append(delim);
-			result.append(file);
-			result.append(delim);
-			result.append(line);
-			result.append(delim);
-			result.append(construct);
-			return result.toString();
-		}
-	}
-
-	/**
-	 * Sort items by filename (then line number)
-	 * 
-	 * @author Beth Tibbitts
-	 * 
-	 * 
-	 */
-	class FilenameSorter extends GenericSorter {
-		@Override
-		public int compare(Viewer viewer, Object e1, Object e2) {
-
-			int cat1 = category(e1);
-			int cat2 = category(e2);
-
-			if (cat1 != cat2)
-				return cat1 - cat2;
-			int res = 0;
-			try {
-				IMarker m1 = (IMarker) e1;
-				IMarker m2 = (IMarker) e2;
-				String file1 = (String) m1.getAttribute(FILENAME);
-				String file2 = (String) m2.getAttribute(FILENAME);
-				System.out.println("ascending=" + ascending); //$NON-NLS-1$
-				if (ascending)
-					res = collator.compare(file1, file2);
-				else
-					res = collator.compare(file2, file1);
-				// if the filename is the same, only then do we look at line
-				// number
-				if (res == 0) {
-					String line1 = m1.getAttribute(LINE).toString();
-					String line2 = m2.getAttribute(LINE).toString();
-					int l1 = Integer.parseInt(line1);
-					int l2 = Integer.parseInt(line2);
-					if (ascending)
-						res = l1 - l2;
-					else
-						res = l2 - l1;
-				}
-				// if the filename and line no are the same, only then do we
-				// look at construct
-				if (res == 0) {
-					if (ascending) {
-						res = collator.compare(getConstructStr(m1), getConstructStr(m2));
-					} else {
-						res = collator.compare(getConstructStr(m2), getConstructStr(m1));
-					}
-				}
-			} catch (CoreException e) {
-				e.printStackTrace();
-			}
-			return res;
-		}
-	}
-
-	class ConstructSorter extends GenericSorter {
-
-		/**
-		 * @param name
-		 * @param file
-		 * @param line
-		 * @param construct
-		 * @return BRT note: Sort isn't quite right: if name,filename identical,
-		 *         "10" would sort before "2" e.g.
-		 */
-		/*
-		 * protected String combine(String name, String file, String line,
-		 * String construct) { final String delim = " - "; StringBuffer result =
-		 * new StringBuffer(construct); result.append(delim);
-		 * result.append(name); result.append(delim); result.append(file);
-		 * result.append(delim); result.append(line); return result.toString();
-		 * }
-		 */
-		@Override
-		public int compare(Viewer viewer, Object e1, Object e2) {
-
-			int cat1 = category(e1);
-			int cat2 = category(e2);
-
-			if (cat1 != cat2)
-				return cat1 - cat2;
-
-			if (e1 instanceof IMarker) {
-				try {
-					IMarker m1 = (IMarker) e1;
-					Object tempObj = m1.getAttribute(IDs.myIndexAttr);
-					int index1 = 0;
-					int index2 = 0;
-					if (tempObj instanceof Integer) {
-						index1 = ((Integer) tempObj).intValue();
-						IMarker m2 = (IMarker) e2;
-						tempObj = m2.getAttribute(IDs.myIndexAttr);
-						// we assume if the first was Integer, this one is, too.
-						assert tempObj instanceof Integer;
-						index2 = ((Integer) tempObj).intValue();
-
-					}
-					int result = 0;
-					if (ascending)
-						result = index1 - index2;
-					else
-						result = index2 - index1;
-
-					return result;
-				} catch (CoreException e) {
-					e.printStackTrace();
-				}
-			}
-			return 0;
-		}
-
-	}
-
-	/**
-	 * This is a callback that will allow us to create the viewer and initialize
-	 * it.
-	 */
-	@Override
-	public void createPartControl(Composite parent) {
-		// Widget created and customized and then passed to viewer during
-		// creation :
-		Table table = new Table(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI | SWT.FULL_SELECTION);
-		TableLayout layout = new TableLayout();
-		table.setLayout(layout);
-		table.setLinesVisible(true);
-		table.setHeaderVisible(true);
-		String[] STD_HEADINGS = { " ", thingname_, Messages.SimpleTableBarrierView_filename, Messages.SimpleTableBarrierView_lineNo, this.columnName_ }; //$NON-NLS-1$
-
-		layout.addColumnData(new ColumnWeightData(1, 1, true));
-		TableColumn tc0 = new TableColumn(table, SWT.NONE);
-		tc0.setText(STD_HEADINGS[0]);
-		tc0.setAlignment(SWT.LEFT);
-		tc0.setResizable(true);
-
-		layout.addColumnData(new ColumnWeightData(10, true));
-		TableColumn tc1 = new TableColumn(table, SWT.NONE);
-		tc1.setText(STD_HEADINGS[1]);
-		tc1.setAlignment(SWT.LEFT);
-		tc1.setResizable(true);
-
-		layout.addColumnData(new ColumnWeightData(10, true));
-		TableColumn tc2 = new TableColumn(table, SWT.NONE);
-		tc2.setText(STD_HEADINGS[2]);
-		tc2.setAlignment(SWT.LEFT);
-		tc2.setResizable(true);
-
-		layout.addColumnData(new ColumnWeightData(5, true));
-		TableColumn tc3 = new TableColumn(table, SWT.NONE);
-		tc3.setText(STD_HEADINGS[3]);
-		tc3.setAlignment(SWT.LEFT);
-		tc3.setResizable(true);
-
-		TableColumn tc4 = null;
-		if (this.columnName_ != null) {
-			layout.addColumnData(new ColumnWeightData(5, true));
-			tc4 = new TableColumn(table, SWT.NONE);
-			tc4.setText(STD_HEADINGS[4]);
-			tc4.setAlignment(SWT.LEFT);
-			tc4.setResizable(true);
-			tc4.setMoveable(true);
-		} else {
-			int numCols = columnNames_.length;
-			TableColumn[] tableCols = new TableColumn[numCols];
-			for (int i = 0; i < numCols; i++) {
-				layout.addColumnData(new ColumnWeightData(5, true));
-				TableColumn tc = new TableColumn(table, SWT.NONE);
-				tc.setText(columnNames_[i]);
-				tc.setAlignment(SWT.LEFT);
-				tc.setResizable(true);
-				tableCols[i] = tc;
-			}
-		}
-
-		// add listeners for table sorting
-		// Sort by "icon" (the original sort order, actually)
-		tc0.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent event) {
-				viewer.setSorter(null);
-				viewer.setSorter(nameSorter);
-			}
-
-			public void widgetDefaultSelected(SelectionEvent event) {
-			}
-		});
-		// Sort by artifact name
-		tc1.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent event) {
-				nameArtifactSorter.sort();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent event) {
-			}
-		});
-		// Sort by file name (then by lineNo)
-		tc2.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent event) {
-				filenameSorter.sort();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent event) {
-			}
-		});
-		// Sort by Line number
-		tc3.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent event) {
-				lineNoSorter.sort();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent event) {
-			}
-		});
-		// Sort by Construct (if we're not doing an array of extra columns)
-		if (tc4 != null) {
-			tc4.addSelectionListener(new SelectionListener() {
-				public void widgetSelected(SelectionEvent event) {
-					constructSorter.sort();
-				}
-
-				public void widgetDefaultSelected(SelectionEvent event) {
-				}
-			});
-		}
-
-		// Selection listener to know when a table row is selected.
-
-		table.addSelectionListener(new SelectionAdapter() {
-
-			@Override
-			public void widgetDefaultSelected(SelectionEvent e) {
-				// System.out.println("widgetDefaultSelected");
-			}
-
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				Object obj = e.getSource();
-				if (obj instanceof Table) {
-					Table t = (Table) obj;
-					int row = t.getSelectionIndex();
-					// rowSelected_ = row;
-					// print marker info when selected in table
-					if (traceOn) {
-						TableItem ti = t.getItem(row);
-						IMarker marker = (IMarker) ti.getData();
-						IArtifact artifact = getSimpleArtifact(marker);
-						String id = marker.getAttribute(uniqueID_, "(error)"); //$NON-NLS-1$
-						int mLine = MarkerUtilities.getLineNumber(marker);
-						int lineNo = 0;
-						if (artifact != null)
-							lineNo = artifact.getLine();
-
-						if (traceOn)
-							System.out.println("MARKER id=" + id + " mkrLineNo=" + mLine + " artifactLineNo=" + lineNo); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-					}
-
-				}
-			}
-		});
-
-		viewer = new TableViewer(table);
-		viewer.setContentProvider(new ViewContentProvider());
-		viewer.setLabelProvider(new ViewLabelProvider());
-		// Set up the sorters.
-		nameSorter = new NameSorter();
-		viewer.setSorter(nameSorter);
-		lineNoSorter = new LineNoSorter();
-		nameArtifactSorter = new NameArtifactSorter();
-		filenameSorter = new FilenameSorter();
-		constructSorter = new ConstructSorter();
-
-		viewer.setInput(ResourcesPlugin.getWorkspace().getRoot());
-		// markers from workspace
-
-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection sel = (IStructuredSelection) event.getSelection();
-				Object obj = sel.getFirstElement();
-				if (obj instanceof IMarker) {
-					selectedMarker_ = (IMarker) obj;
-				}
-				showStatusMessage("", "selectionChanged"); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		});
-
-		makeActions();
-		hookContextMenu();
-		hookDoubleClickAction();
-		contributeToActionBars();
-	}
-
-	private void hookContextMenu() {
-		MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager manager) {
-				SimpleTableBarrierView.this.fillContextMenu(manager);
-			}
-		});
-		Menu menu = menuMgr.createContextMenu(viewer.getControl());
-		viewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(menuMgr, viewer);
-	}
-
-	private void contributeToActionBars() {
-		IActionBars bars = getViewSite().getActionBars();
-		fillLocalPullDown(bars.getMenuManager());
-		fillLocalToolBar(bars.getToolBarManager());
-	}
-
-	private void fillLocalPullDown(IMenuManager manager) {
-		manager.add(infoAction);
-		manager.add(new Separator());
-		manager.add(filterAction);
-	}
-
-	private void fillContextMenu(IMenuManager manager) {
-		manager.add(infoAction);
-		// Other plug-ins can contribute their actions here
-		manager.add(new Separator("Additions")); //$NON-NLS-1$
-	}
-
-	private void fillLocalToolBar(IToolBarManager manager) {
-		manager.add(infoAction);
-	}
-
-	/**
-	 * Make the action objects for the menus and toolbar.
-	 * 
-	 */
-	private void makeActions() {
-		makeShowInfoAction();
-		makeFilterAction();
-		makeDoubleClickAction();
-	}
-
-	/**
-	 * Make "show info" action to display artifact information
-	 */
-	protected void makeShowInfoAction() {
-		infoAction = new Action() {
-			@Override
-			public void run() {
-				String title = thingname_ + Messages.SimpleTableBarrierView_information;
-				if (selectedMarker_ != null) {
-					String idFromMarker = selectedMarker_.getAttribute(uniqueID_, null);
-					if (idFromMarker == null) {
-						System.out.println("ATV: exception reading marker ID"); //$NON-NLS-1$
-						return;
-					}
-					StringBuffer info = new StringBuffer();
-
-					IArtifact artifact = artifactManager_.getArtifact(idFromMarker);
-					info.append(Messages.SimpleTableBarrierView_file_name).append(artifact.getFileName());
-					info.append(Messages.SimpleTableBarrierView_line_number).append(artifact.getLine());
-					info.append(Messages.SimpleTableBarrierView_name).append(artifact.getShortName());
-					info.append(Messages.SimpleTableBarrierView_description).append(artifact.getDescription());
-
-					MessageDialog.openInformation(null, title, info.toString());
-				}// end if selectedMarker!=null
-				else {
-					MessageDialog.openInformation(null, title, Messages.SimpleTableBarrierView_no + thingname_ + Messages.SimpleTableBarrierView_selected);
-				}
-				// ------------------
-			}
-		};
-		infoAction.setText(Messages.SimpleTableBarrierView_showInfo);
-		infoAction.setToolTipText(Messages.SimpleTableBarrierView_showDetailedInfoForSelected + thingname_);
-		infoAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages()
-				.getImageDescriptor(ISharedImages.IMG_OBJS_INFO_TSK));
-	}
-
-	/**
-	 * make filter action (TBD)
-	 */
-	private void makeFilterAction() {
-		filterAction = new Action() {
-			@Override
-			public void run() {
-				showMessage(Messages.SimpleTableBarrierView_filter + thingnames_ + Messages.SimpleTableBarrierView_determineWhich + thingnames_ + Messages.SimpleTableBarrierView_areShownInThisViewDot);
-			}
-		};
-		filterAction.setText(Messages.SimpleTableBarrierView_filter + thingnames_);
-		filterAction.setToolTipText(Messages.SimpleTableBarrierView_filterWhich + thingnames_ + Messages.SimpleTableBarrierView_areShownInThisView);
-	}
-
-	/**
-	 * Make double-click action, which moves editor to the artifact instance in
-	 * the source code (editor to line in source code)
-	 * 
-	 */
-	private void makeDoubleClickAction() {
-
-		doubleClickAction = new Action() {
-			@Override
-			public void run() {
-				ISelection selection = viewer.getSelection();
-				Object obj = ((IStructuredSelection) selection).getFirstElement();
-				IMarker marker = (IMarker) obj;
-				try {
-					IFile f = (IFile) marker.getResource();
-					int lineNo = getMarkerLineNo(marker);
-					if (f != null && f.exists()) {
-						IWorkbenchPage wbp = getSite().getPage();
-						// IEditorInput ieu = new FileEditorInput(f);
-						IEditorPart editor = IDE.openEditor(wbp, f);
-
-						if (traceOn)
-							System.out.println("dca: marker lineNo before " + MarkerUtilities.getLineNumber(marker)); //$NON-NLS-1$
-						// note: (re?) setting linenumber here is required to
-						// put marker in editor!?!
-						MarkerUtilities.setLineNumber(marker, lineNo);
-						if (traceOn)
-							System.out.println("dca: marker lineNo after " + MarkerUtilities.getLineNumber(marker)); //$NON-NLS-1$
-						IDE.gotoMarker(editor, marker);
-						if (traceOn)
-							System.out.println("ATV: DoubleClickAction, clear status"); //$NON-NLS-1$
-						showStatusMessage("", "double click action"); //$NON-NLS-1$ //$NON-NLS-2$
-					}
-				} catch (Exception e) {
-					System.out.println("ATV.doubleclickAction: Error positioning editor page from marker line number"); //$NON-NLS-1$
-					showStatusMessage("Error positioning editor from marker line number", "error marker goto"); //$NON-NLS-1$ //$NON-NLS-2$
-					e.printStackTrace();
-				}
-			}
-		};
-	}
-
-	private void hookDoubleClickAction() {
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				doubleClickAction.run();
-			}
-		});
-	}
-
-	private void showMessage(String message) {
-		MessageDialog.openInformation(viewer.getControl().getShell(), viewName_, message);
-	}
-
-	private void showStatusMessage(String message, String debugMessage) {
-		if (traceStatusLine) {
-			message += " - "; //$NON-NLS-1$
-			message += debugMessage;
-		}
-		getViewSite().getActionBars().getStatusLineManager().setMessage(message);
-		getViewSite().getActionBars().getStatusLineManager().update(true);
-
-	}
-
-	/**
-	 * Passing the focus request to the viewer's control.
-	 */
-	@Override
-	public void setFocus() {
-		showStatusMessage("", "setFocus"); // reset status message //$NON-NLS-1$ //$NON-NLS-2$
-		if (!viewer.getControl().isDisposed())
-			viewer.getControl().setFocus();
-	}
-
-	@Override
-	public void dispose() {
-		if (traceOn)
-			System.out.println("SimpleTableView.dispose()"); //$NON-NLS-1$
-		// BRT do we need to dispose of imageDescriptors we made? or just
-		// images?
-
-	}
-
-	public void showMarker(IMarker marker) {
-		System.out.println("Marker-------  IMarker.LINE_NUMBER=" + IMarker.LINE_NUMBER); //$NON-NLS-1$
-		try {
-			Map attrs = marker.getAttributes();
-			Iterator iter = attrs.entrySet().iterator();
-			while (iter.hasNext()) {
-				Map.Entry e = (Map.Entry) iter.next();
-				System.out.println("   " + e.getKey() + " " + e.getValue()); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-
-		} catch (CoreException e) {
-			e.printStackTrace();
-		}
-
-	}
-
-	public ImageDescriptor makeImageDescriptor(String iconName) {
-		URL url = thePlugin_.find(new Path(iconName));
-		ImageDescriptor id = ImageDescriptor.createFromURL(url);
-		return id;
-	}
-
-	/**
-	 * Push change info (artifact and marker) onto a stack so we can remember
-	 * it, for possible undo action. Also enables/disables the Undo action
-	 * button.
-	 * 
-	 * @param artifact
-	 * @param marker
-	 */
-	protected void pushChangedInfo(IArtifact artifact, IMarker marker) {
-		changedArts_.push(artifact);
-		changedMarkers_.push(marker);
-		checkUndoStatus();
-	}
-
-	/**
-	 * Set status of undo action (enabled or disabled) based on if there are any
-	 * artifact changes, or other changes, available to undo
-	 * 
-	 */
-	protected void checkUndoStatus() {
-
-	}
-
-	/**
-	 * Get marker line numbers.
-	 * 
-	 * @param marker
-	 * @return
-	 */
-	protected int getMarkerLineNo(IMarker marker) {
-		int lineNo = getIntAttr(marker, IMarker.LINE_NUMBER);
-		return lineNo;
-	}
-
-	/**
-	 * Get an int value that is assumed to be stored in a marker in a given
-	 * attribute.
-	 * 
-	 * @param marker
-	 * @param attr
-	 *            the attribute name
-	 * 
-	 * @return the int value, or 0 if none found, or invalid value found
-	 */
-	protected int getIntAttr(IMarker marker, String attr) {
-		String temp = null;
-		try {
-			temp = marker.getAttribute(attr).toString();
-		} catch (Exception e) { // CoreException or ClassCastException possible
-			e.printStackTrace();
-			System.out.println("ATV: Marker lineNo(" + attr + ") invalid; using 0"); //$NON-NLS-1$ //$NON-NLS-2$
-			return 0;
-		}
-		int lineNo = 0;
-		try {
-			lineNo = Integer.parseInt(temp);
-		} catch (NumberFormatException nfe) {
-			System.out.println("ATV: Marker lineNo(" + temp + " from attr " + attr + ") invalid (NumberFormatException); using 0"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		}
-		return lineNo;
-	}
-
-	/**
-	 * convenience method for getting attribute String value.
-	 * 
-	 * @param marker
-	 * @param attr
-	 * @return
-	 */
-	protected String getAttribute(IMarker marker, String attr) {
-		String result = null;
-		try {
-			result = (String) marker.getAttribute(attr);
-		} catch (Exception e) {
-			System.out.println("** Exception getting marker attribute " + e); //$NON-NLS-1$
-			e.printStackTrace();
-		}
-		return result;
-
-	}
-
-	/**
-	 * a Stack that isn't based on Vector - Generic LIFO stack
-	 * 
-	 * @author Beth Tibbitts
-	 * 
-	 * 
-	 */
-	public class StackList {
-		private final LinkedList list = new LinkedList();
-
-		public void push(Object v) {
-			list.addFirst(v);
-		}
-
-		public Object top() {
-			return list.getFirst();
-		}
-
-		public Object pop() {
-			return list.removeFirst();
-		}
-
-		public boolean isEmpty() {
-			return list.isEmpty();
-		}
-
-	}
-
-	/**
-	 * Visit the resource delta to look for the marker changes we are interested
-	 * in
-	 * 
-	 * @author Beth Tibbitts
-	 */
-	public class UpdateVisitor implements IResourceDeltaVisitor {
-
-		/**
-		 * Visit appropriate parts of the resource delta to find the markers
-		 * that changed that we care about.
-		 * 
-		 * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
-		 */
-		public boolean visit(IResourceDelta delta) throws CoreException {
-			IResource resource = delta.getResource();
-			String name = resource.getName();
-			if (resource.getType() == IResource.FILE) {
-				if (delta.getKind() == IResourceDelta.CHANGED) {
-					if (traceOn)
-						System.out.println("UpdateVisitor: file changed: " + name); //$NON-NLS-1$
-
-					// Handle file changes (saves) by reporting the changes
-					// made to the file, to update backend analysis
-					// representation
-					IFile f = (IFile) resource;
-					int flags = delta.getFlags();
-					int contentChanged = flags & IResourceDelta.CONTENT;
-
-					if (validForAnalysis(f.getName())) {
-						if (traceOn)
-							System.out.println("File " + f.getName() + " is valid for analysis so will process the change..."); //$NON-NLS-1$ //$NON-NLS-2$
-						if (contentChanged != 0) {
-							// do we need to tell back end (analysis engine)
-							// that file changed?
-						}
-
-						// refresh markers for that file?
-						IMarkerDelta[] mDeltas = delta.getMarkerDeltas();
-						int len = mDeltas.length;
-						for (int j = 0; j < len; j++) {
-							IMarkerDelta delta3 = mDeltas[j];
-							if (traceOn)
-								showMarkerDeltaKind(delta3);
-							IMarker m = delta3.getMarker();
-							String ln = IMarker.LINE_NUMBER;
-							if (traceOn)
-								System.out.println("---UpdateVisitor.visit():viewer update marker: (lineNo)"); //$NON-NLS-1$
-							// showMarker(m);
-							String[] props = new String[1]; // awkward. why???
-							props[0] = ln;
-							// just update viewer item, not the whole view
-							// viewer.refresh();
-							viewer.update(m, props);
-						} // end loop
-					} else {
-						if (traceOn)
-							System.out.println("File " + f.getName() + " is NOT valid for analysis so will ignore change..."); //$NON-NLS-1$ //$NON-NLS-2$
-
-					}
-				} // end if CHANGED
-				else if (delta.getKind() == IResourceDelta.ADDED) {
-					// System.out.println("Resource added.");
-					checkMarkerDeltas(delta);
-				} else if (delta.getKind() == IResourceDelta.REPLACED) {
-					// System.out.println("Resource replaced.");
-					checkMarkerDeltas(delta);
-				} else if (delta.getKind() == IResourceDelta.REMOVED) {
-					// System.out.println("Resource removed.");
-					checkMarkerDeltas(delta);
-				}
-			} // end if FILE
-			return true; // keep going
-		}
-
-		private void checkMarkerDeltas(IResourceDelta delta) {
-			IMarkerDelta[] md1 = delta.getMarkerDeltas();
-			int len = md1.length;
-			// System.out.println("       ... found " + len + " markerDeltas.");
-		}
-
-		/**
-		 * Show info about the marker in the marker delta. This is just tracing
-		 * the info available until we do something with it. For now, we're just
-		 * doing a (big) viewer.refresh() to refresh all the markers. When we
-		 * get more intelligent about just updating the ones that changed, we
-		 * can remove that. Shouldn't make much different for small sets of
-		 * markers, but for many markers, this could be a significant
-		 * performance improvement.
-		 * 
-		 * @param delta3
-		 */
-		private void showMarkerDeltaKind(IMarkerDelta delta3) {
-
-			// int mdKind = delta3.getKind();
-			IMarker m = delta3.getMarker();
-
-			String kind = "UNKNOWN"; //$NON-NLS-1$
-			switch (delta3.getKind()) {
-			case IResourceDelta.ADDED:
-				kind = "ADDED"; //$NON-NLS-1$
-				break;
-			case IResourceDelta.CHANGED:
-				kind = "CHANGED"; //$NON-NLS-1$
-				break;
-			case IResourceDelta.REMOVED:
-				kind = "REMOVED"; //$NON-NLS-1$
-				break;
-			default:
-				kind = "UNKNOWN"; //$NON-NLS-1$
-				break;
-			}
-
-			if (traceOn)
-				System.out.println("    markerDeltaKind=" + kind); //$NON-NLS-1$
-			String mid = "", ml = "", mlpi = ""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			try {
-				// note: we're getting marker deltas on ALL markers,
-				// not just artifact markers, which can throw us off.
-				// in particular, temp markers used by actions?
-
-				mid = m.getAttribute(uniqueID_).toString();
-				ml = m.getAttribute(IMarker.LINE_NUMBER).toString();
-				// mlpi = m.getAttribute(IDs.LINE).toString();
-			} catch (Exception e1) {
-				// ignore errors; only tracing for now.
-				System.out.println("ATV.UpdateVisitor error getting marker info "); //$NON-NLS-1$
-				// e1.printStackTrace();
-			}
-			if (traceOn)
-				System.out.println("    markerID_=" + mid + "  lineNo(mkr-mpiA)=" + ml + "-" + mlpi); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		}
-
-	} // end class UpdateVisitor
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/SimpleTreeTableMarkerView.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/SimpleTreeTableMarkerView.java
deleted file mode 100644
index ed25786..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis/src/org/eclipse/ptp/pldt/mpi/analysis/view/SimpleTreeTableMarkerView.java
+++ /dev/null

@@ -1,1776 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,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.pldt.mpi.analysis.view;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IMarkerDelta;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.ptp.pldt.common.ArtifactManager;
-import org.eclipse.ptp.pldt.common.CommonPlugin;
-import org.eclipse.ptp.pldt.common.IArtifact;
-import org.eclipse.ptp.pldt.mpi.analysis.IDs;
-import org.eclipse.ptp.pldt.mpi.analysis.messages.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeColumn;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.ui.texteditor.MarkerUtilities;
-
-/**
- * Like SimpleTableView - easy view that shows markers - but uses a TreeTable to
- * show some hierarchy. Currently limited to one level of hierarchy <br>
- * Markers are the leaf nodes.<br>
- * An attribute in the markers indicates the (artificial) parent node, for
- * grouping.
- * 
- * TODO: This is basically a copy of class from common plugin
- * (org.eclipse.ptp.pldt.common); need to work toward replacing this with that one -
- * however some changes have been made to this one
- * 
- * 
- * 
- */
-public class SimpleTreeTableMarkerView extends ViewPart {
-	protected TreeViewer viewer;
-
-	private Tree tree; // keep so we can dispose of listeners in dispose()?
-
-	protected Action infoAction;
-
-	private Action filterAction;
-
-	private Action doubleClickAction;
-	protected Action removeMarkerAction;
-
-	private static final boolean traceOn = false;
-
-	private static final boolean traceStatusLine = false;
-
-	protected ViewerSorter nameSorter;
-
-	protected GenericSorter lineNoSorter;
-
-	protected FilenameSorter filenameSorter;
-
-	protected GenericSorter orderSorter; // by "icon"
-
-	protected GenericSorter nameArtifactSorter;
-
-	protected GenericSorter constructSorter;
-
-	private IMarker selectedMarker_ = null;
-
-	/**
-	 * List of artifacts that were changed due to some action upon them in the
-	 * view (currently unused)
-	 */
-	protected StackList changedArts_ = new StackList();
-
-	/**
-	 * List of markers that were involved in a change on the the associated
-	 * artifact due to some action upon them here in the view (currently unused)
-	 */
-	protected StackList changedMarkers_ = new StackList();
-
-	protected UpdateVisitor visitor_ = new UpdateVisitor();
-
-	/**
-	 * Be consistent about what we call these things; generic values (can be)
-	 * replaced on ctor. <br>
-	 * These are read from plugin.xml if not passed on ctor
-	 */
-	protected String thingname_ = Messages.SimpleTreeTableMarkerView_artifact;
-
-	protected String thingnames_ = Messages.SimpleTreeTableMarkerView_artifacts;
-
-	private String columnName_ = Messages.SimpleTreeTableMarkerView_value;
-
-	private AbstractUIPlugin thePlugin_;
-
-	private String iconName_ = "icons/sample.gif"; //$NON-NLS-1$
-
-	private String viewName_;
-
-	private String markerID_;
-
-	protected ArtifactManager artifactManager_;
-
-	private String[] columnNames_;
-
-	private String[] markerAttrNames_;
-
-	/**
-	 * The ID used in the marker for the unique ID for each artifact. Enables
-	 * mapping back to the Artifact object if necessary.
-	 */
-	protected String uniqueID_ = "uniqueID"; //$NON-NLS-1$
-
-	/**
-	 * The ID used in the marker for the extra column of information (last
-	 * column)
-	 */
-	protected String columnID_ = "constructType"; // id for (variable) //$NON-NLS-1$
-
-	/** Marker ID for artifact name - e.g. API name, pragma name, etc. */
-	protected static final String NAME = "name"; //$NON-NLS-1$
-
-	/** Marker ID for storage of the filename in which the artifact is found */
-	protected static final String FILENAME = "filename"; //$NON-NLS-1$
-
-	/**
-	 * Marker id for storage of line number on which the artifact is found.
-	 * Reuse of default ID used by IMarker, repeated here for ease of use and
-	 * for clarity that THIS is the marker ID for line number.
-	 */
-	protected static final String LINE = IMarker.LINE_NUMBER;
-
-	/** Marker id for storage of additional information about the artifact */
-	protected static final String DESCRIPTION = "description"; //$NON-NLS-1$
-
-	public static final int NONE = 0;
-
-	public static final int FUNCTION_CALL = 1;
-
-	public static final int CONSTANT = 2;
-
-	/** types of constructs, for the default case */
-	public static final String[] CONSTRUCT_TYPE_NAMES = { Messages.SimpleTreeTableMarkerView_none,
-			Messages.SimpleTreeTableMarkerView_functionCall, Messages.SimpleTreeTableMarkerView_constant };
-
-	/**
-	 * Simple Artifact Table View constructor
-	 * <p>
-	 * Everything can be null, and defaults will be taken, or read from
-	 * plugin.xml for the view.
-	 * <p>
-	 * Note: if a null plugIn instance is provided, the default plugin (this
-	 * one) will not be able to find resources (e.g. icon images) if the derived
-	 * class is in its own plug-in, and its icons are, too.
-	 */
-	public SimpleTreeTableMarkerView(AbstractUIPlugin thePlugin,
-			String thingname, String thingnames, String columnName,
-			String markerID) {
-
-		if (thePlugin == null) {
-			thePlugin_ = CommonPlugin.getDefault();
-		} else {
-			this.thePlugin_ = thePlugin;
-		}
-		if (thingname != null)
-			this.thingname_ = thingname;
-		if (thingnames != null)
-			this.thingnames_ = thingnames;
-		if (columnName != null) {
-			this.columnName_ = columnName; // last column named by subclass
-		}
-		this.markerID_ = markerID;// if null, will use view id.
-
-		findViewInfo();
-
-	}
-
-	/**
-	 * Simple table view with an arbitrary number of extra columns
-	 * 
-	 * @param thePlugin
-	 * @param thingname
-	 * @param thingnames
-	 * @param attrNames
-	 *            list of marker attributes, for which the column values will be
-	 *            extractd
-	 * @param colNames
-	 *            list of Column names, used as headers for the values found in
-	 *            the marker attributes
-	 * @param markerID_
-	 */
-	public SimpleTreeTableMarkerView(AbstractUIPlugin thePlugin,
-			String thingname, String thingnames, String[] attrNames,
-			String[] colNames, String markerID) {
-		this(thePlugin, thingname, thingnames, null, markerID);
-		columnNames_ = colNames;
-		columnName_ = null;// set this so we can tell we are using array of
-		// attrs/cols
-		markerAttrNames_ = attrNames;
-
-	}
-
-	/**
-	 * Ctor that uses defaults for everything (testing? theoretically, this
-	 * should work, and should be reusable since info that must be unique is
-	 * read from from plugin.xml.)
-	 * 
-	 */
-	public SimpleTreeTableMarkerView() {
-		this(null, null, null, null, null, null);
-	}
-
-	/**
-	 * Find info from the view info in the manifest. This includes the icon
-	 * name, the view id (used as marker id if none given on ctor), and
-	 * constructs an artifact manager for this view's artifact objects
-	 * 
-	 */
-	protected void findViewInfo() {
-		String classname = this.getClass().getName();
-		// try to find the icon specified in the plugin.xml for this
-		// extension/view
-		IExtension[] ext = Platform.getExtensionRegistry().getExtensionPoint(
-				"org.eclipse.ui.views").getExtensions(); //$NON-NLS-1$
-		for (int i = 0; i < ext.length; i++) {
-			IExtension extension = ext[i];
-			IConfigurationElement[] ces = extension.getConfigurationElements();
-			for (int j = 0; j < ces.length; j++) {
-				IConfigurationElement cElement = ces[j];
-				String iconName = cElement.getAttribute("icon"); //$NON-NLS-1$
-				String classN = cElement.getAttribute("class"); //$NON-NLS-1$
-				String name = cElement.getAttribute("name"); //$NON-NLS-1$
-				if (classname.equals(classN)) {
-					if (iconName != null) {
-						iconName_ = iconName;
-					}
-					this.viewName_ = name;
-					if (markerID_ == null) {
-						// use plugin id for marker id, if not specified
-						markerID_ = cElement.getAttribute("id"); //$NON-NLS-1$
-					}
-					artifactManager_ = ArtifactManager.getManager(markerID_);
-					if (artifactManager_ == null) {
-						artifactManager_ = new ArtifactManager(markerID_);
-					}
-				}
-
-			}
-
-		}
-	}
-
-	/**
-	 * It might be useful for subclasses to override this, to say which
-	 * filenames should allow the action "run analysis" to create new artifacts
-	 * and thus new markers. <br>
-	 * This is a default implementation
-	 * 
-	 * @param filename
-	 * @return
-	 */
-	public boolean validForAnalysis(String filename) {
-		// return MpiUtil.validForAnalysis(filename);
-		return true;
-
-	}
-
-	/**
-	 * The content provider class is responsible for providing objects to the
-	 * view. It can wrap existing objects in adapters or simply return objects
-	 * as-is. These objects may be sensitive to the current input of the view,
-	 * or ignore it and always show the same content (like Task List, for
-	 * example).
-	 */
-	class ViewContentProvider implements IStructuredContentProvider,
-			ITreeContentProvider, IResourceChangeListener {
-		private IResource input;
-		private boolean hasRegistered = false;
-
-		public void inputChanged(Viewer v, Object oldInput, Object newInput) {
-			// could use this to change the list to just artifacts from one
-			// resource,
-			// etc...
-			// could cache viewer here this.viewer=v;
-			if (traceOn)
-				System.out.println("STTMV inputChanged()..."); //$NON-NLS-1$
-			// if this is the first time we have been given an input
-			if (!hasRegistered) {
-				// add me as a resource change listener so i can refresh at
-				// least when markers are changed
-				// POST_CHANGE: only want event notifications for after-the-fact
-				ResourcesPlugin.getWorkspace().addResourceChangeListener(this,
-						IResourceChangeEvent.POST_CHANGE);
-				hasRegistered = true;
-				if (traceOn)
-					System.out
-							.println("STTMV: Registered RCL for ViewContentProvider"); //$NON-NLS-1$
-			}
-			if (newInput instanceof IResource) {
-				this.input = (IResource) newInput;
-			}
-
-		}
-
-		public void dispose() {
-			if (traceOn)
-				System.out.println("STTMV.ViewContentProvider.dispose()"); //$NON-NLS-1$
-			ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-
-		}
-
-		/**
-		 * Get the list of objects to populate this view.
-		 */
-		@SuppressWarnings("unchecked")
-		public Object[] getElements(Object parent) {
-			ArrayList list = new ArrayList();
-			Object[] objs = null;
-			try {
-				String id = markerID_;
-				if (input == null) {
-					if (traceOn)
-						System.out.println("input is null in getElements..."); //$NON-NLS-1$
-				}
-				// use the cached input object instead of querying from
-				// workspace
-				// objs =
-				// ResourcesPlugin.getWorkspace().getRoot().findMarkers(id,
-				// false, IResource.DEPTH_INFINITE);
-				objs = input.findMarkers(id, true, IResource.DEPTH_INFINITE);
-				IMarker[] markers = (IMarker[]) objs;
-				for (int i = 0; i < markers.length; i++) {
-					IMarker marker = markers[i];
-					int parentID = getParentID(marker);
-					if (parentID == 0) {
-						list.add(marker);
-					}
-				}
-			} catch (CoreException e) {
-				System.out
-						.println("STTMV, exception getting model elements (markers for Table view)"); //$NON-NLS-1$
-				//e.printStackTrace();
-			}
-			if (traceOn)
-				System.out.println("STTMV.get---Elements, found " + objs.length //$NON-NLS-1$
-						+ " markers/parentNodes"); //$NON-NLS-1$
-			return list.toArray();
-
-		}
-
-		private int getParentID(IMarker marker) {
-			int parentID = 0;
-			try {
-				parentID = ((Integer) marker.getAttribute(IDs.parentIDAttr))
-						.intValue();
-			} catch (CoreException e) {
-				if(traceOn)System.out.println("Barrier SimpleTreeTableMarkerView.getParentID,  "+e.getMessage()); //$NON-NLS-1$
-				//e.printStackTrace();
-			}
-			return parentID;
-		}
-
-		private int getMyID(IMarker marker) {
-			int parentID = 0;
-			try {
-				parentID = ((Integer) marker.getAttribute(IDs.myIDAttr))
-						.intValue();
-			} catch (CoreException e) {
-				e.printStackTrace();
-			}
-			return parentID;
-		}
-
-		private String getMyName(IMarker marker) {
-			String name = (String) null;
-			try {
-				name = (String) marker.getAttribute(IDs.myNameAttr);
-			} catch (CoreException e) {
-				e.printStackTrace();
-			}
-			return name;
-		}
-
-		public Object[] getChildren(Object parent) {
-			if (parent instanceof IMarker) {
-				IMarker parentMarker = (IMarker) parent;
-				int parentID = getMyID(parentMarker);
-				IMarker[] markers = null;
-				try {
-					markers = input.findMarkers(markerID_, false,
-							IResource.DEPTH_INFINITE);
-				} catch (CoreException e) {
-					e.printStackTrace();
-				}
-				List<IMarker> children = new ArrayList<IMarker>();
-				for (int i = 0; i < markers.length; i++) {
-					IMarker marker = markers[i];
-					int id = getParentID(marker);
-					if (id == parentID) {
-						children.add(marker);
-					}
-				}
-				return children.toArray();
-			}
-			// markers are leaf nodes, they don't have children
-			// if not a ParentNode, then it should be a leaf node (marker)
-			return new Object[] {};
-		}
-
-		public Object getParent(Object element) {
-			if (element instanceof IMarker) {
-				IMarker child = (IMarker) element;
-				int parentID = getParentID(child);
-				IMarker[] markers = null;
-				try {
-					markers = input.findMarkers(markerID_, false,
-							IResource.DEPTH_INFINITE);
-				} catch (CoreException e) {
-					e.printStackTrace();
-				}
-				for (int i = 0; i < markers.length; i++) {
-					IMarker marker = markers[i];
-					int id = getMyID(marker);
-					if (id == parentID) {
-						return marker;
-					}
-				}
-			}
-			return null;
-		}
-
-		public boolean hasChildren(Object element) {
-			Object[] kids = getChildren(element);
-			boolean hasKids = kids.length > 0;
-			return hasKids;
-		}
-
-		/**
-		 * react to a resource change event
-		 * 
-		 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
-		 */
-
-		public void resourceChanged(IResourceChangeEvent event) {
-			if (traceOn)
-				System.out.println("-----------------resourceChanged()"); //$NON-NLS-1$
-			final IResourceDelta delta = event.getDelta();
-			if (traceOn)
-				printResourcesChanged(delta, 1);
-			// remove the following when resource delta visitor does it all?
-			Control ctrl = viewer.getControl();
-			if (ctrl != null && !ctrl.isDisposed()) {
-				ctrl.getDisplay().syncExec(new Runnable() {
-					public void run() {
-						try {
-							if (traceOn)
-								System.out
-										.println("viewer.update ea mkr in delta-- from resourceChanged()..."); //$NON-NLS-1$
-							if (traceOn)
-								System.out
-										.println("----processResourceChangeDelta()..."); //$NON-NLS-1$
-							processResourceChangeDelta(delta);
-							if (traceOn)
-								System.out
-										.println("----END processResourceChangeDelta()..."); //$NON-NLS-1$
-							if (traceOn)
-								System.out.println("viewer.refresh()"); //$NON-NLS-1$
-							// we should have updated the indiv. rows we care
-							// about,
-							// but need this for Marker display after initial
-							// analysis,
-							// and for markers deleted, etc. Can remove when we
-							// more completely
-							// handle things in processResourceChangeDelta
-							// (removes etc.)
-							viewer.refresh();
-
-						} catch (Exception e) {
-							if(traceOn) System.out.println("STTMV: Exception refreshing viewer: "+ e); //$NON-NLS-1$
-							//e.printStackTrace();
-						}
-
-					}
-				});
-			}
-			if (traceOn)
-				System.out.println("-----------------END resourceChanged()\n"); //$NON-NLS-1$
-
-		}
-
-		/**
-		 * Debugging statement help - prints the events, indented by nesting
-		 * level
-		 * 
-		 * @param delta
-		 * @param indent
-		 */
-		private void printResourcesChanged(IResourceDelta delta, int indent) {
-			printOneResourceChanged(delta, indent);
-			IResourceDelta[] children = delta.getAffectedChildren();
-			for (int i = 0; i < children.length; i++)
-				printResourcesChanged(children[i], indent + 1);
-		}
-
-		/**
-		 * Some debugging statement help
-		 * 
-		 * @param delta
-		 * @param indent
-		 */
-		private void printOneResourceChanged(IResourceDelta delta, int indent) {
-			StringBuffer buf = new StringBuffer(80);
-			for (int i = 0; i < indent; i++)
-				buf.append("  "); //$NON-NLS-1$
-			switch (delta.getKind()) {
-			case IResourceDelta.ADDED:
-				buf.append("ADDED"); //$NON-NLS-1$
-				break;
-			case IResourceDelta.REMOVED:
-				buf.append("REMOVED"); //$NON-NLS-1$
-				break;
-			case IResourceDelta.CHANGED:
-				buf.append("CHANGED"); //$NON-NLS-1$
-				testDelta(delta);
-				break;
-			default:
-				buf.append("["); //$NON-NLS-1$
-				buf.append(delta.getKind());
-				buf.append("]"); //$NON-NLS-1$
-				break;
-			}
-			buf.append(" "); //$NON-NLS-1$
-			buf.append(delta.getResource());
-			System.out.println(buf);
-		}
-
-		/**
-		 * Show debugging info for a resource delta change
-		 * 
-		 * @param delta
-		 */
-		private void testDelta(IResourceDelta delta) {
-			// -- code from eclipse help:
-			// case IResourceDelta.CHANGED:
-			System.out.print("Resource "); //$NON-NLS-1$
-			System.out.print(delta.getFullPath());
-			System.out.println(" has changed."); //$NON-NLS-1$
-			int flags = delta.getFlags();
-			if ((flags & IResourceDelta.CONTENT) != 0) {
-				System.out.println("--> Content Change"); //$NON-NLS-1$
-			}
-			if ((flags & IResourceDelta.REPLACED) != 0) {
-				System.out.println("--> Content Replaced"); //$NON-NLS-1$
-			}
-			if ((flags & IResourceDelta.MARKERS) != 0) {
-				System.out.println("--> Marker Change"); //$NON-NLS-1$
-				// IMarkerDelta[] markers = delta.getMarkerDeltas();
-				// if interested in markers, check these deltas
-			}
-		}
-
-		/**
-		 * Process the resource change - just the delta
-		 * 
-		 * @param delta
-		 */
-		protected void processResourceChangeDelta(IResourceDelta delta) {
-			try {
-				delta.accept(visitor_);
-
-			} catch (CoreException e2) {
-				System.out
-						.println("Error in PITV.processResourceChangeDelta().."); //$NON-NLS-1$
-				e2.printStackTrace();
-			}
-		}
-	} // end ViewContentProvider
-
-	/**
-	 * get artifact from marker
-	 * 
-	 * @param marker
-	 * @return
-	 */
-	protected IArtifact getSimpleArtifact(IMarker marker) {
-		String id = null;
-		IArtifact artifact = null;
-		try {
-			id = (String) marker.getAttribute(uniqueID_);
-			artifact = artifactManager_.getArtifact(id);
-
-		} catch (CoreException e) {
-			// e.printStackTrace();
-			System.out.println(e.getMessage()
-					+ " ... STV, CoreException getting artifact from hashMap; " //$NON-NLS-1$
-					+ thingname_ + " id=" + id); //$NON-NLS-1$
-		} catch (NullPointerException ne) {
-			System.out.println(ne.getMessage()
-					+ " ... STV, NullPtrExcp getting artifact from hashMap;" //$NON-NLS-1$
-					+ thingname_ + " id=" + id); //$NON-NLS-1$
-		}
-		return artifact;
-
-	}
-
-	/**
-	 * Get string representing the type of construct
-	 * 
-	 * @param marker
-	 * @return
-	 * @throws CoreException
-	 */
-	protected String getConstructStr(IMarker marker) throws CoreException {
-		Integer temp = (Integer) marker.getAttribute(columnID_);
-		if (temp != null) {
-			Integer constructType = (Integer) temp;
-			// return CONSTRUCT_TYPE_NAMES[constructType.intValue()];
-			Integer index = new Integer(constructType.intValue() - 4);
-			return index.toString();
-		} else
-			return " "; //$NON-NLS-1$
-	}
-
-	/**
-	 * 
-	 * ViewLabelProvider - provides the text and images for the artifacts in the
-	 * Table View
-	 * 
-	 * @author Beth Tibbitts
-	 * 
-	 * 
-	 */
-	class ViewLabelProvider extends LabelProvider implements
-			ITableLabelProvider {
-		/**
-		 * Keep icons already created, and reuse the images
-		 */
-		private HashMap iconHash = new HashMap();
-
-		private IArtifact artifact;
-
-		/**
-		 * provide what goes in each column; get the info from the marker
-		 */
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-		 */
-		public String getText(Object o) {
-			String temp = super.getText(o);
-			// System.out.println("Text: " + temp);
-			return temp;
-		}
-
-		/**
-		 * Determine the text to go in each column. Note: the parent nodes will
-		 * be ParentNode objects, and the child nodes will be IMarkers.
-		 * 
-		 * @param obj
-		 *            the Marker (we hope) that goes on the current row
-		 * @param index
-		 *            the column number in the table
-		 * 
-		 */
-		public String getColumnText(Object obj, int index) {
-			if (obj == null) {
-				System.out.println("STTMV: LabelProv obj is null; index=" //$NON-NLS-1$
-						+ index);
-				return "STTMV obj null"; //$NON-NLS-1$
-			}
-			if (obj instanceof IMarker) {
-				IMarker marker = (IMarker) obj;
-				try {
-					String myName = (String) marker
-							.getAttribute(IDs.myNameAttr);
-					switch (index) {
-					case 0:
-						return myName;
-					case 1:
-						String id = (String) marker.getAttribute(NAME);
-						return id;
-					case 2:
-						return (String) marker.getAttribute(FILENAME);
-					case 3:
-						String line = (marker.getAttribute(IMarker.LINE_NUMBER))
-								.toString();
-						if (traceOn)
-							debugMarkerInfo(marker, line);
-						return line;
-					case 4:
-						/*
-						 * if (columnName_ != null) {// we're not using array
-						 * return getConstructStr(marker); } // else drop
-						 * through...
-						 */
-						Integer indexNum = (Integer) marker
-								.getAttribute(IDs.myIndexAttr);
-						return indexNum.toString();
-					default:
-						String attrName = markerAttrNames_[index - 4];
-						String val = marker.getAttribute(attrName, ""); //$NON-NLS-1$
-						return val;
-					}
-				} catch (CoreException ce) {
-					return ("STTMV error in ViewContentProvider of SimpleTreeTableMarkerView"); //$NON-NLS-1$
-				}
-			}
-			return "STTMV, vcp???"; //$NON-NLS-1$
-		}
-
-		/**
-		 * Purely for debugging marker info in ViewLabelProvider.getColumnText()
-		 * 
-		 * @param marker
-		 * @param line
-		 */
-		private void debugMarkerInfo(IMarker marker, String line) {
-			artifact = getSimpleArtifact(marker);
-			String compLine = line + "-"; //$NON-NLS-1$
-			if (artifact == null) {
-				if (traceOn)
-					System.out.println("STTMV getColumnText- null artifact"); //$NON-NLS-1$
-			} else {
-				int lineArtifact = artifact.getLine();
-				compLine = compLine + lineArtifact;
-			}
-			System.out
-					.println("STTMV.ViewLabelProvider gets marker line: mkr-artifact: " //$NON-NLS-1$
-							+ compLine);
-			showMarker(marker);
-		}
-
-		/**
-		 * Provide the image that goes in a column, if any (Note that a table
-		 * cell can contain both, an image and text, which will be displayed
-		 * side-by-side)
-		 * 
-		 * @param obj -
-		 *            the object we're getting the image for
-		 * @param index -
-		 *            the column that this image is to go in
-		 */
-		public Image getColumnImage(Object obj, int index) {
-			// we only put image icon in the first column
-			switch (index) {
-			case 0:
-				return getCustomImage(obj);
-			default:
-				return null;
-			}
-		}
-
-		/**
-		 * Get image for artifact. Note that different images could be used for
-		 * different types of artifacts. For now we have a single image.
-		 * 
-		 * @param obj
-		 *            the marker object that this artifact is represented by
-		 * @return image for marker
-		 *         <p>
-		 *         Note: if a null plugIn instance is provided on the view ctor,
-		 *         the default plugin (this one) will not be able to find
-		 *         resources (e.g. icon images) if the derived class is in its
-		 *         own plug-in, and its icons are, too.
-		 * 
-		 */
-		protected Image getCustomImage(Object obj) {
-			// if we've already created one of this type of icon, reuse it.
-			// Note: use ImageRegistry instead?
-			Image img = (Image) iconHash.get(iconName_);
-			if (img == null) {
-				Path path = new Path(iconName_);
-				// BRT make sure the specific plugin is being used here to find
-				// its OWN icons
-				URL url = thePlugin_.find(path);
-				ImageDescriptor id = ImageDescriptor.createFromURL(url);
-				img = id.createImage();
-				if (traceOn)
-					System.out.println("STTMV: ***** created image for " //$NON-NLS-1$
-							+ iconName_);
-				iconHash.put(iconName_, img);// save for reuse
-			}
-			return img;
-		}
-
-		/**
-		 * Dispose of anything that would hang around rudely otherwise (such as
-		 * image objects from the icons)
-		 * 
-		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-		 */
-
-		public void dispose() {
-			if (traceOn)
-				System.out
-						.println("STTMV.ViewLabelProvider.dispose(); dispose of icon images"); //$NON-NLS-1$
-			for (Iterator iter = iconHash.values().iterator(); iter.hasNext();) {
-				Image img = (Image) iter.next();
-				img.dispose();
-			}
-			super.dispose();
-		}
-
-	}
-
-	/**
-	 * Default sorter for items - the order they were created, which tends to
-	 * group items with their source code locations
-	 * 
-	 * @author Beth Tibbitts
-	 */
-	class NameSorter extends ViewerSorter {
-	}
-
-	/**
-	 * Sort items by one or more of: artifact, filename, lineNo,
-	 * variableColumnName.<br>
-	 * The derived classes will implement combine() to say how the attributes
-	 * are combined to get the sort desired.
-	 * 
-	 * @author Beth Tibbitts
-	 */
-	abstract class GenericSorter extends ViewerSorter {
-		protected boolean ascending = true;
-
-		/**
-		 * Compare two items to determine sort order. Sort items by one or more
-		 * of: artifact name, then file, then line number, then construct
-		 */
-		public int compare(Viewer viewer, Object e1, Object e2) {
-			int result = 0;
-
-			int cat1 = category(e1);
-			int cat2 = category(e2);
-
-			if (cat1 != cat2)
-				return cat1 - cat2;
-
-			java.text.Collator collator = this.getCollator();
-
-			if (e1 instanceof IMarker) {
-				try {
-					IMarker m1 = (IMarker) e1;
-					IMarker m2 = (IMarker) e2;
-					String name1 = (String) m1.getAttribute(NAME);
-					String file1 = (String) m1.getAttribute(FILENAME);
-
-					String line1 = (String) m1.getAttribute(LINE).toString();
-					String construct1 = getConstructStr(m1);
-					String sort1 = combine(name1, file1, line1, construct1);
-
-					String name2 = (String) m2.getAttribute(NAME);
-					String file2 = (String) m2.getAttribute(FILENAME);
-					String line2 = (String) m2.getAttribute(LINE).toString();
-					String construct2 = getConstructStr(m2);
-					String sort2 = combine(name2, file2, line2, construct2);
-
-					if (ascending)
-						result = collator.compare(sort1, sort2);
-					else
-						result = collator.compare(sort2, sort1);
-
-					return result;
-				} catch (CoreException e) {
-					e.printStackTrace();
-				}
-			}
-			return 0;
-
-		}
-
-		/**
-		 * Combine name, file, and/or line number to provide the string to sort
-		 * by. Will be overridden by derived classes as needed
-		 * 
-		 * @param name
-		 * @param file
-		 * @param line
-		 * @param construct
-		 * @return always return null, subclass can choose to impl. this method.
-		 */
-		protected String combine(String name, String file, String line,
-				String construct) {
-			return null;
-		}
-
-		/**
-		 * switch to this sorter. If it was already this sorter, then toggle the
-		 * sort order
-		 * 
-		 */
-		public void sort() {
-			// String className = this.getClass().getName();
-			// System.out.println(className+".sort() ascending="+ascending);
-			if (this == viewer.getSorter()) {
-				ascending = !ascending;
-				viewer.setSorter(null); // turn off to force re-sort
-			} else {
-				ascending = true;
-			}
-			viewer.setSorter(this);
-
-		}
-
-	}
-
-	/**
-	 * Sorter to sort by line number on which the SimpleArtifact is Found
-	 * 
-	 * @author Beth Tibbitts created
-	 * 
-	 * 
-	 */
-	class LineNoSorter extends GenericSorter {
-		/**
-		 * sort items by line number
-		 */
-		public int compare(Viewer viewer, Object e1, Object e2) {
-
-			int cat1 = category(e1);
-			int cat2 = category(e2);
-
-			if (cat1 != cat2)
-				return cat1 - cat2;
-
-			if (e1 instanceof IMarker) {
-				try {
-					IMarker m1 = (IMarker) e1;
-					Object tempObj = m1.getAttribute(LINE);
-					int line1 = 0;
-					int line2 = 0;
-					if (tempObj instanceof Integer) {
-						line1 = ((Integer) tempObj).intValue();
-						IMarker m2 = (IMarker) e2;
-						tempObj = m2.getAttribute(LINE);
-						// we assume if the first was Integer, this one is, too.
-						assert tempObj instanceof Integer;
-						line2 = ((Integer) tempObj).intValue();
-
-					}
-					int result = 0;
-					if (ascending)
-						result = line1 - line2;
-					else
-						result = line2 - line1;
-
-					return result;
-				} catch (CoreException e) {
-					e.printStackTrace();
-				}
-			}
-			return 0;
-
-		}
-	}
-
-	/**
-	 * Sort items by name
-	 * 
-	 * @author Beth Tibbitts
-	 * 
-	 * 
-	 */
-	class NameArtifactSorter extends GenericSorter {
-
-		/**
-		 * @param name
-		 * @param file
-		 * @param line
-		 * @param construct
-		 * @return BRT note: Sort isn't quite right: if name,filename identical,
-		 *         "10" would sort before "2" e.g.
-		 */
-		protected String combine(String name, String file, String line,
-				String construct) {
-			final String delim = " - "; //$NON-NLS-1$
-			StringBuffer result = new StringBuffer(name);
-			result.append(delim);
-			result.append(file);
-			result.append(delim);
-			result.append(line);
-			result.append(delim);
-			result.append(construct);
-			return result.toString();
-		}
-	}
-
-	/**
-	 * Sort items by filename (then line number)
-	 * 
-	 * @author Beth Tibbitts
-	 * 
-	 * 
-	 */
-	class FilenameSorter extends GenericSorter {
-		public int compare(Viewer viewer, Object e1, Object e2) {
-
-			int cat1 = category(e1);
-			int cat2 = category(e2);
-
-			if (cat1 != cat2)
-				return cat1 - cat2;
-			int res = 0;
-			try {
-				IMarker m1 = (IMarker) e1;
-				IMarker m2 = (IMarker) e2;
-				String file1 = (String) m1.getAttribute(FILENAME);
-				String file2 = (String) m2.getAttribute(FILENAME);
-				System.out.println("ascending=" + ascending); //$NON-NLS-1$
-				if (ascending)
-					res = collator.compare(file1, file2);
-				else
-					res = collator.compare(file2, file1);
-				// if the filename is the same, only then do we look at line
-				// number
-				if (res == 0) {
-					String line1 = m1.getAttribute(LINE).toString();
-					String line2 = m2.getAttribute(LINE).toString();
-					int l1 = Integer.parseInt(line1);
-					int l2 = Integer.parseInt(line2);
-					if (ascending)
-						res = l1 - l2;
-					else
-						res = l2 - l1;
-				}
-				// if the filename and line no are the same, only then do we
-				// look at construct
-				if (res == 0) {
-					if (ascending) {
-						res = collator.compare(getConstructStr(m1),
-								getConstructStr(m2));
-					} else {
-						res = collator.compare(getConstructStr(m2),
-								getConstructStr(m1));
-					}
-				}
-			} catch (CoreException e) {
-				e.printStackTrace();
-			}
-			return res;
-		}
-	}
-
-	class ConstructSorter extends GenericSorter {
-
-		/**
-		 * @param name
-		 * @param file
-		 * @param line
-		 * @param construct
-		 * @return BRT note: Sort isn't quite right: if name,filename identical,
-		 *         "10" would sort before "2" e.g.
-		 */
-		protected String combine(String name, String file, String line,
-				String construct) {
-			final String delim = " - "; //$NON-NLS-1$
-			StringBuffer result = new StringBuffer(construct);
-			result.append(delim);
-			result.append(name);
-			result.append(delim);
-			result.append(file);
-			result.append(delim);
-			result.append(line);
-			return result.toString();
-		}
-	}
-
-	/**
-	 * This is a callback that will allow us to create the viewer and initialize
-	 * it.
-	 */
-	public void createPartControl(Composite parent) {
-		tree = new Tree(parent, SWT.BORDER);
-		tree.setLinesVisible(true);
-		tree.setHeaderVisible(true);
-
-		createTreeColumns();
-		if (false) {
-			SelectionListener treeSelectionListener = new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent event) {
-					Object src = event.getSource();
-					if (!traceOn)
-						return;
-					if (src instanceof TreeItem) {
-						if (traceOn)
-							System.out.println("TreeItem selected"); //$NON-NLS-1$
-					} else if (src instanceof TreeColumn) {
-						if (traceOn)
-							System.out.println("TreeColumn selected"); //$NON-NLS-1$
-
-					} else if (src instanceof Tree) {
-						if (traceOn)
-							System.out.println("Tree selected"); //$NON-NLS-1$
-						Tree tree = (Tree) src;
-					}
-				}
-			};
-			tree.addSelectionListener(treeSelectionListener);
-		}
-		viewer = new TreeViewer(tree);
-		viewer.setContentProvider(new ViewContentProvider());
-		viewer.setLabelProvider(new ViewLabelProvider());
-		// Set up the sorters.
-		nameSorter = new NameSorter();
-		viewer.setSorter(nameSorter);
-		lineNoSorter = new LineNoSorter();
-		nameArtifactSorter = new NameArtifactSorter();
-		filenameSorter = new FilenameSorter();
-		constructSorter = new ConstructSorter();
-
-		viewer.setInput(ResourcesPlugin.getWorkspace().getRoot());
-		// markers from workspace
-
-		viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection sel = (IStructuredSelection) event
-						.getSelection();
-				Object obj = sel.getFirstElement();
-				if (obj instanceof IMarker) {
-					selectedMarker_ = (IMarker) obj;
-				}
-				showStatusMessage("", "selectionChanged"); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		});
-
-		makeActions();
-		hookContextMenu();
-		hookDoubleClickAction();
-		contributeToActionBars();
-	}
-
-	private void createTreeColumns() {
-		TreeColumn column;
-		column = new TreeColumn(tree, SWT.LEFT); // col 1 barrier name
-		column = new TreeColumn(tree, SWT.LEFT); // col 2 fn name
-		column = new TreeColumn(tree, SWT.LEFT); // col 3 filename
-		column = new TreeColumn(tree, SWT.LEFT); // col 4 lineno
-		column = new TreeColumn(tree, SWT.LEFT); // col 5 construct
-
-		TreeColumn[] columns = tree.getColumns();
-		int numColumns = columns.length;
-		SelectionListener[] columnListeners = new SelectionListener[numColumns];
-		String[] headings = new String[] { Messages.SimpleTreeTableMarkerView_barrierMatchingSet, Messages.SimpleTreeTableMarkerView_function,
-				Messages.SimpleTreeTableMarkerView_filename, Messages.SimpleTreeTableMarkerView_lineNo, Messages.SimpleTreeTableMarkerView_indexNo };
-		int[] widths = new int[] { 120, 100, 100, 100, 100 };
-
-		for (int i = 0; i < numColumns; i++) {
-			int colNo = i; // could be re-ordered later
-			// int colNo = columnOrder[i];
-			columns[colNo].setText(headings[colNo]);
-			columns[colNo].setWidth(widths[colNo]);
-			columns[colNo].setResizable(true);
-			columns[colNo].setMoveable(true); // can reorder columns by
-			// dragging
-			SelectionListener columnListener = new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent event) {
-					Object src = event.getSource();
-					if (src instanceof TreeColumn) {
-						TreeColumn tc = (TreeColumn) src;
-						String text = tc.getText();
-						if (true)
-							System.out.println("tree column selected: " + text); //$NON-NLS-1$
-						Object data = tc.getData();
-						if (data instanceof ViewerSorter) {
-							GenericSorter sorter = (GenericSorter) data;
-							sorter.sort();
-
-						} else
-							System.out.println("** not a sorter ** " + data); //$NON-NLS-1$
-
-					}
-				}
-			};
-
-			columns[colNo].addSelectionListener(columnListener);
-			columnListeners[colNo] = columnListener;
-		}
-	}
-
-	private void hookContextMenu() {
-		MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager manager) {
-				SimpleTreeTableMarkerView.this.fillContextMenu(manager);
-			}
-		});
-		Menu menu = menuMgr.createContextMenu(viewer.getControl());
-		viewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(menuMgr, viewer);
-	}
-
-	private void contributeToActionBars() {
-		IActionBars bars = getViewSite().getActionBars();
-		fillLocalPullDown(bars.getMenuManager());
-		fillLocalToolBar(bars.getToolBarManager());
-	}
-
-	private void fillLocalPullDown(IMenuManager manager) {
-		manager.add(infoAction);
-		manager.add(new Separator());
-		manager.add(filterAction);
-	}
-
-	private void fillContextMenu(IMenuManager manager) {
-		manager.add(infoAction);
-		// Other plug-ins can contribute their actions here
-		manager.add(new Separator("Additions")); //$NON-NLS-1$
-	}
-
-	private void fillLocalToolBar(IToolBarManager manager) {
-		manager.add(infoAction);
-		manager.add(removeMarkerAction); // BRT barrierMarker - put remove marker action in here
-	}
-
-	/**
-	 * Make the action objects for the menus and toolbar.
-	 * 
-	 */
-	private void makeActions() {
-		makeShowInfoAction();
-		makeFilterAction();
-		makeDoubleClickAction();
-		makeRemoveMarkerAction(); // BRT barrierMarker removeMarkerAction
-	}
-
-	/**
-	 * Make "show info" action to display artifact information
-	 */
-	protected void makeShowInfoAction() {
-		infoAction = new Action() {
-			public void run() {
-				String title = thingname_ + Messages.SimpleTreeTableMarkerView_information;
-				if (selectedMarker_ != null) {
-					String idFromMarker = (String) selectedMarker_
-							.getAttribute(uniqueID_, null);
-					if (idFromMarker == null) {
-						System.out
-								.println("STTMV: exception reading marker ID"); //$NON-NLS-1$
-						return;
-					}
-					StringBuffer info = new StringBuffer();
-
-					IArtifact artifact = artifactManager_
-							.getArtifact(idFromMarker);
-					info.append(Messages.SimpleTreeTableMarkerView_file_name).append(artifact.getFileName());
-					info.append(Messages.SimpleTreeTableMarkerView_line_number).append(artifact.getLine());
-					info.append(Messages.SimpleTreeTableMarkerView_name).append(artifact.getShortName());
-					info.append(Messages.SimpleTreeTableMarkerView_description).append(
-							artifact.getDescription());
-
-					MessageDialog.openInformation(null, title, info.toString());
-				}// end if selectedMarker!=null
-				else {
-					MessageDialog.openInformation(null, title, Messages.SimpleTreeTableMarkerView_no
-							+ thingname_ + Messages.SimpleTreeTableMarkerView_selected);
-				}
-				// ------------------
-			}
-		};
-		infoAction.setText(Messages.SimpleTreeTableMarkerView_showInfo);
-		infoAction.setToolTipText(Messages.SimpleTreeTableMarkerView_showDetailedInfoForSelected
-				+ thingname_);
-		infoAction.setImageDescriptor(PlatformUI.getWorkbench()
-				.getSharedImages().getImageDescriptor(
-						ISharedImages.IMG_OBJS_INFO_TSK));
-	}
-
-	/**
-	 * make filter action (TBD)
-	 */
-	private void makeFilterAction() {
-		filterAction = new Action() {
-			public void run() {
-				showMessage(Messages.SimpleTreeTableMarkerView_filter + thingnames_ + Messages.SimpleTreeTableMarkerView_determineWhich
-						+ thingnames_ + Messages.SimpleTreeTableMarkerView_areShownInThisView);
-			}
-		};
-		filterAction.setText(Messages.SimpleTreeTableMarkerView_filter + thingnames_);
-		filterAction.setToolTipText(Messages.SimpleTreeTableMarkerView_filterWhich + thingnames_
-				+ Messages.SimpleTreeTableMarkerView_areShownInThisView2);
-	}
-
-	/**
-	 * Make double-click action, which moves editor to the artifact instance in
-	 * the source code (editor to line in source code)
-	 * 
-	 */
-	private void makeDoubleClickAction() {
-
-		doubleClickAction = new Action() {
-			public void run() {
-				ISelection selection = viewer.getSelection();
-				Object obj = ((IStructuredSelection) selection)
-						.getFirstElement();
-				// This action only makes sense on child nodes (markers)
-				if (!(obj instanceof IMarker)) {
-					return;
-				}
-				IMarker marker = (IMarker) obj;
-				try {
-					IFile f = (IFile) marker.getResource();
-					int lineNo = getMarkerLineNo(marker);
-					if (f != null && f.exists()) {
-						IWorkbenchPage wbp = getSite().getPage();
-						// IEditorInput ieu = new FileEditorInput(f);
-						IEditorPart editor = IDE.openEditor(wbp, f);
-
-						if (traceOn)
-							System.out.println("dca: marker lineNo before " //$NON-NLS-1$
-									+ MarkerUtilities.getLineNumber(marker));
-						// note: (re?) setting linenumber here is required to
-						// put marker in editor!?!
-						MarkerUtilities.setLineNumber(marker, lineNo);
-						if (traceOn)
-							System.out.println("dca: marker lineNo after " //$NON-NLS-1$
-									+ MarkerUtilities.getLineNumber(marker));
-						IDE.gotoMarker(editor, marker);
-						if (traceOn)
-							System.out
-									.println("STTMV: DoubleClickAction, clear status"); //$NON-NLS-1$
-						showStatusMessage("", "double click action"); //$NON-NLS-1$ //$NON-NLS-2$
-					}
-				} catch (Exception e) {
-					System.out
-							.println("STTMV.doubleclickAction: Error positioning editor page from marker line number"); //$NON-NLS-1$
-					showStatusMessage(
-							"Error positioning editor from marker line number", //$NON-NLS-1$
-							"error marker goto"); //$NON-NLS-1$
-					e.printStackTrace();
-				}
-			}
-		};
-	}
-
-	private void hookDoubleClickAction() {
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				doubleClickAction.run();
-			}
-		});
-	}
-
-	private void showMessage(String message) {
-		MessageDialog.openInformation(viewer.getControl().getShell(),
-				viewName_, message);
-	}
-
-	private void showStatusMessage(String message, String debugMessage) {
-		if (traceStatusLine) {
-			message += " - "; //$NON-NLS-1$
-			message += debugMessage;
-		}
-		getViewSite().getActionBars().getStatusLineManager()
-				.setMessage(message);
-		getViewSite().getActionBars().getStatusLineManager().update(true);
-
-	}
-
-	/**
-	 * Passing the focus request to the viewer's control.
-	 */
-	public void setFocus() {
-		showStatusMessage("", "setFocus"); // reset status message //$NON-NLS-1$ //$NON-NLS-2$
-		if (!viewer.getControl().isDisposed())
-			viewer.getControl().setFocus();
-	}
-
-	public void dispose() {
-		if (traceOn)
-			System.out.println("SimpleTableView.dispose()"); //$NON-NLS-1$
-		// BRT do we need to dispose of imageDescriptors we made? or just
-		// images?
-
-	}
-
-	public void showMarker(IMarker marker) {
-		System.out.println("Marker-------  IMarker.LINE_NUMBER=" //$NON-NLS-1$
-				+ IMarker.LINE_NUMBER);
-		try {
-			Map attrs = marker.getAttributes();
-			Iterator iter = attrs.entrySet().iterator();
-			while (iter.hasNext()) {
-				Map.Entry e = (Map.Entry) iter.next();
-				System.out.println("   " + e.getKey() + " " + e.getValue()); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-
-		} catch (CoreException e) {
-			e.printStackTrace();
-		}
-
-	}
-
-	public ImageDescriptor makeImageDescriptor(String iconName) {
-		URL url = thePlugin_.find(new Path(iconName));
-		ImageDescriptor id = ImageDescriptor.createFromURL(url);
-		return id;
-	}
-
-	/**
-	 * Push change info (artifact and marker) onto a stack so we can remember
-	 * it, for possible undo action. Also enables/disables the Undo action
-	 * button.
-	 * 
-	 * @param artifact
-	 * @param marker
-	 */
-	protected void pushChangedInfo(IArtifact artifact, IMarker marker) {
-		changedArts_.push(artifact);
-		changedMarkers_.push(marker);
-		checkUndoStatus();
-	}
-
-	/**
-	 * Set status of undo action (enabled or disabled) based on if there are any
-	 * artifact changes, or other changes, available to undo
-	 * 
-	 */
-	protected void checkUndoStatus() {
-
-	}
-
-	/**
-	 * Get marker line numbers.
-	 * 
-	 * @param marker
-	 * @return
-	 */
-	protected int getMarkerLineNo(IMarker marker) {
-		int lineNo = getIntAttr(marker, IMarker.LINE_NUMBER);
-		return lineNo;
-	}
-
-	/**
-	 * Get an int value that is assumed to be stored in a marker in a given
-	 * attribute.
-	 * 
-	 * @param marker
-	 * @param attr
-	 *            the attribute name
-	 * 
-	 * @return the int value, or 0 if none found, or invalid value found
-	 */
-	protected int getIntAttr(IMarker marker, String attr) {
-		String temp = null;
-		try {
-			temp = marker.getAttribute(attr).toString();
-		} catch (Exception e) { // CoreException or ClassCastException possible
-			e.printStackTrace();
-			System.out.println("STTMV: Marker lineNo(" + attr //$NON-NLS-1$
-					+ ") invalid; using 0"); //$NON-NLS-1$
-			return 0;
-		}
-		int lineNo = 0;
-		try {
-			lineNo = Integer.parseInt(temp);
-		} catch (NumberFormatException nfe) {
-			System.out.println("STTMV: Marker lineNo(" + temp + " from attr " //$NON-NLS-1$ //$NON-NLS-2$
-					+ attr + ") invalid (NumberFormatException); using 0"); //$NON-NLS-1$
-		}
-		return lineNo;
-	}
-
-	/**
-	 * convenience method for getting attribute String value.
-	 * 
-	 * @param marker
-	 * @param attr
-	 * @return
-	 */
-	protected String getAttribute(IMarker marker, String attr) {
-		String result = null;
-		try {
-			result = (String) marker.getAttribute(attr);
-		} catch (Exception e) {
-			System.out.println("** Exception getting marker attribute " + e); //$NON-NLS-1$
-			e.printStackTrace();
-		}
-		return result;
-
-	}
-
-	/**
-	 * Make "remove marker" action to display remove barrier markers and barrier error markers
-	 */
-	protected void makeRemoveMarkerAction() {
-		removeMarkerAction = new Action() {
-			public void run() {
-				// batch changes so we get only one resource change event
-				final IWorkspaceRoot wsResource = ResourcesPlugin.getWorkspace().getRoot();
-				
-				IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
-					public void run(IProgressMonitor monitor)
-							throws CoreException {
-						try {
-							int depth = IResource.DEPTH_INFINITE;
-							if (traceOn) {
-								IMarker[] bMarkers = wsResource.findMarkers(IDs.barrierMarkerID, true, depth);
-								IMarker[] eMarkers = wsResource.findMarkers(IDs.errorMarkerID, true, depth);
-								IMarker[] mMarkers = wsResource.findMarkers(IDs.matchingSetMarkerID, true, depth);
-								IMarker[] pMarkers = wsResource.findMarkers(IMarker.PROBLEM, true, depth);
-
-								int bLen = bMarkers.length;
-								int eLen = eMarkers.length;
-								int mLen = mMarkers.length;
-								int pLen = pMarkers.length;
-
-								System.out.println("RemoveMarkers: found "+ bLen + " barrier markers, " + eLen //$NON-NLS-1$ //$NON-NLS-2$
-										+ " error markers and " + mLen+ " matching set markers found."); //$NON-NLS-1$ //$NON-NLS-2$
-								System.out.println(pLen + " problem markers."); //$NON-NLS-1$
-							}
-							wsResource.deleteMarkers(IDs.barrierMarkerID,true, depth);
-							wsResource.deleteMarkers(IDs.errorMarkerID, true, depth);
-							wsResource.deleteMarkers(IDs.matchingSetMarkerID, true, depth);
-							if (traceOn)System.out.println("markers removed."); //$NON-NLS-1$
-
-						} catch (CoreException e) {
-							System.out.println("STTMV: exception deleting BARRIER markers."); //$NON-NLS-1$
-						}
-					}
-				};
-					try {
-						runnable.run(null);
-					} catch (CoreException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-	
-				 
-			}//end run()
-		};// end new action
-		removeMarkerAction.setText(Messages.SimpleTreeTableMarkerView_removeMarkers);
-		removeMarkerAction.setToolTipText(Messages.SimpleTreeTableMarkerView_removeMarkers);
-		removeMarkerAction.setImageDescriptor(PlatformUI.getWorkbench()
-				.getSharedImages().getImageDescriptor(
-						ISharedImages.IMG_TOOL_DELETE));// nice "red X" image
-	
-	}
-
-	/**
-	 * a Stack that isn't based on Vector - Generic LIFO stack
-	 * 
-	 * @author Beth Tibbitts
-	 * 
-	 * 
-	 */
-	public class StackList {
-		private LinkedList list = new LinkedList();
-
-		public void push(Object v) {
-			list.addFirst(v);
-		}
-
-		public Object top() {
-			return list.getFirst();
-		}
-
-		public Object pop() {
-			return list.removeFirst();
-		}
-
-		public boolean isEmpty() {
-			return list.isEmpty();
-		}
-
-	}
-
-	/**
-	 * Visit the resource delta to look for the marker changes we are interested
-	 * in
-	 * 
-	 * @author Beth Tibbitts
-	 */
-	public class UpdateVisitor implements IResourceDeltaVisitor {
-
-		/**
-		 * Visit appropriate parts of the resource delta to find the markers
-		 * that changed that we care about.
-		 * 
-		 * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
-		 */
-		public boolean visit(IResourceDelta delta) throws CoreException {
-			IResource resource = delta.getResource();
-			String name = resource.getName();
-			if (resource.getType() == IResource.FILE) {
-				if (delta.getKind() == IResourceDelta.CHANGED) {
-					if (traceOn)
-						System.out.println("UpdateVisitor: file changed: " //$NON-NLS-1$
-								+ name);
-
-					// Handle file changes (saves) by reporting the changes
-					// made to the file, to update backend analysis
-					// representation
-					IFile f = (IFile) resource;
-					int flags = delta.getFlags();
-					int contentChanged = flags & IResourceDelta.CONTENT;
-
-					if (validForAnalysis(f.getName())) {
-						if (traceOn)
-							System.out
-									.println("File " //$NON-NLS-1$
-											+ f.getName()
-											+ " is valid for analysis so will process the change..."); //$NON-NLS-1$
-						if (contentChanged != 0) {
-							// do we need to tell back end (analysis engine)
-							// that file changed?
-						}
-
-						// refresh markers for that file?
-						IMarkerDelta[] mDeltas = delta.getMarkerDeltas();
-						int len = mDeltas.length;
-						for (int j = 0; j < len; j++) {
-							IMarkerDelta delta3 = mDeltas[j];
-							if (traceOn)
-								showMarkerDeltaKind(delta3);
-							IMarker m = delta3.getMarker();
-							String ln = IMarker.LINE_NUMBER;
-							if (traceOn)
-								System.out
-										.println("---UpdateVisitor.visit():viewer update marker: (lineNo)"); //$NON-NLS-1$
-							// showMarker(m);
-							String[] props = new String[1]; // awkward. why???
-							props[0] = ln;
-							// just update viewer item, not the whole view
-							// viewer.refresh();
-							viewer.update(m, props);
-						} // end loop
-					} else {
-						if (traceOn)
-							System.out
-									.println("File " //$NON-NLS-1$
-											+ f.getName()
-											+ " is NOT valid for analysis so will ignore change..."); //$NON-NLS-1$
-
-					}
-				} // end if CHANGED
-				else if (delta.getKind() == IResourceDelta.ADDED) {
-					//System.out.println("Resource added.");
-					checkMarkerDeltas(delta);
-				} else if (delta.getKind() == IResourceDelta.REPLACED) {
-					//System.out.println("Resource replaced.");
-					checkMarkerDeltas(delta);
-				} else if (delta.getKind() == IResourceDelta.REMOVED) {
-					//System.out.println("Resource removed.");
-					checkMarkerDeltas(delta);
-				}
-			} // end if FILE
-			return true; // keep going
-		}
-
-		private void checkMarkerDeltas(IResourceDelta delta) {
-			IMarkerDelta[] md1 = delta.getMarkerDeltas();
-			int len = md1.length;
-			//System.out.println("       ... found " + len + " markerDeltas.");
-		}
-
-		/**
-		 * Show info about the marker in the marker delta. This is just tracing
-		 * the info available until we do something with it. For now, we're just
-		 * doing a (big) viewer.refresh() to refresh all the markers. When we
-		 * get more intelligent about just updating the ones that changed, we
-		 * can remove that. Shouldn't make much different for small sets of
-		 * markers, but for many markers, this could be a significant
-		 * performance improvement.
-		 * 
-		 * @param delta3
-		 */
-		private void showMarkerDeltaKind(IMarkerDelta delta3) {
-
-			// int mdKind = delta3.getKind();
-			IMarker m = delta3.getMarker();
-
-			String kind = "UNKNOWN"; //$NON-NLS-1$
-			switch (delta3.getKind()) {
-			case IResourceDelta.ADDED:
-				kind = "ADDED"; //$NON-NLS-1$
-				break;
-			case IResourceDelta.CHANGED:
-				kind = "CHANGED"; //$NON-NLS-1$
-				break;
-			case IResourceDelta.REMOVED:
-				kind = "REMOVED"; //$NON-NLS-1$
-				break;
-			default:
-				kind = "UNKNOWN"; //$NON-NLS-1$
-				break;
-			}
-
-			if (traceOn)
-				System.out.println("    markerDeltaKind=" + kind); //$NON-NLS-1$
-			String mid = "", ml = "", mlpi = ""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			try {
-				// note: we're getting marker deltas on ALL markers,
-				// not just artifact markers, which can throw us off.
-				// in particular, temp markers used by actions?
-
-				mid = m.getAttribute(uniqueID_).toString();
-				ml = m.getAttribute(IMarker.LINE_NUMBER).toString();
-				// mlpi = m.getAttribute(IDs.LINE).toString();
-			} catch (Exception e1) {
-				// ignore errors; only tracing for now.
-				System.out
-						.println("STTMV.UpdateVisitor error getting marker info for change type: " //$NON-NLS-1$
-								+ kind);
-				// e1.printStackTrace();
-			}
-			if (traceOn)
-				System.out.println("    markerID_=" + mid //$NON-NLS-1$
-						+ "  lineNo(mkr-mpiA)=" + ml + "-" + mlpi); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-	} // end class UpdateVisitor
-
-}
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/.classpath b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.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/tools/pldt/org.eclipse.ptp.pldt.mpi.core/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/.cvsignore
deleted file mode 100644
index cd73485..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-bin
-@dot
-icons-old

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/.project b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/.project
deleted file mode 100644
index 5add6b9..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.mpi.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/tools/pldt/org.eclipse.ptp.pldt.mpi.core/.settings/org.eclipse.jdt.core.prefs b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 310a180..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/.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.core/META-INF/MANIFEST.MF b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 0b06518..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/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.pldt.mpi.core; singleton:=true
-Bundle-Version: 4.0.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.ptp.pldt.mpi.core.MpiPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.ptp.pldt.mpi.core,
- org.eclipse.ptp.pldt.mpi.core.actions,
- org.eclipse.ptp.pldt.mpi.core.analysis,
- org.eclipse.ptp.pldt.mpi.core.editorHelp,
- org.eclipse.ptp.pldt.mpi.core.prefs,
- org.eclipse.ptp.pldt.mpi.core.views
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.ui.ide,
- org.eclipse.ui.editors,
- org.eclipse.cdt.core,
- org.eclipse.cdt.ui,
- org.eclipse.search,
- org.eclipse.help,
- org.eclipse.cdt.doc.user,
- org.eclipse.ptp.pldt.common,
- org.eclipse.photran.cdtinterface;resolution:=optional,
- org.eclipse.photran.core;resolution:=optional,
- org.eclipse.photran.core.vpg;resolution:=optional
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/about.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/build.properties b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/build.properties
deleted file mode 100644
index 7e96699..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/build.properties
+++ /dev/null

@@ -1,18 +0,0 @@
-bin.includes = plugin.xml,\
-               html/,\
-               icons/,\
-               mpiref.xml,\
-               samples/,\
-               META-INF/,\
-               .,\
-               templates/,\
-               plugin.properties,\
-               about.html
-src.includes = html/,\
-               icons/,\
-               mpiref.xml,\
-               plugin.xml,\
-               samples/
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Abort.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Abort.html
deleted file mode 100644
index ddf03f0..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Abort.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Abort</title>
-<body>
-<H3>MPI_Abort</H3>
-<PRE>
-int MPI_Abort(MPI_Comm, int);
-</PRE>
-<DL><DD>
-Forces all tasks of an MPI job to terminate.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Accumulate.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Accumulate.html
deleted file mode 100644
index 577acd1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Accumulate.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Accumulate</title>
-<body>
-<H3>MPI_Accumulate</H3>
-<PRE>
-int MPI_Accumulate(void *, int, MPI_Datatype, int, MPI_Aint, int, MPI_Datatype,  MPI_Op, MPI_Win);
-</PRE>
-<DL><DD>
-Accumulates, according to the specified reduction operation, the contents of the origin buffer to the specified target buffer.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Add_error_class.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Add_error_class.html
deleted file mode 100644
index d8eb397..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Add_error_class.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Add_error_class</title>
-<body>
-<H3>MPI_Add_error_class</H3>
-<PRE>
-int MPI_Add_error_class(int *);
-</PRE>
-<DL><DD>
-Creates a new error class and returns the value for it.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Add_error_code.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Add_error_code.html
deleted file mode 100644
index 83928bf..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Add_error_code.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Add_error_code</title>
-<body>
-<H3>MPI_Add_error_code</H3>
-<PRE>
-int MPI_Add_error_code(int, int *);
-</PRE>
-<DL><DD>
-Creates a new error code and returns the value for it.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Add_error_string.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Add_error_string.html
deleted file mode 100644
index 88e9fe3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Add_error_string.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Add_error_string</title>
-<body>
-<H3>MPI_Add_error_string</H3>
-<PRE>
-int MPI_Add_error_string(int, char *);
-</PRE>
-<DL><DD>
-Associates an error string with an error code or class.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Address.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Address.html
deleted file mode 100644
index e497fc8..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Address.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Address</title>
-<body>
-<H3>MPI_Address</H3>
-<PRE>
-int MPI_Address(void*, MPI_Aint *);
-</PRE>
-<DL><DD>
-Returns the address of a location in memory.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Allgather.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Allgather.html
deleted file mode 100644
index f1233f7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Allgather.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Allgather</title>
-<body>
-<H3>MPI_Allgather</H3>
-<PRE>
-int MPI_Allgather(void* , int, MPI_Datatype, void*, int, MPI_Datatype, MPI_Comm);
-</PRE>
-<DL><DD>
-Collects messages from each task and distributes the resulting message to each.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Allgatherv.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Allgatherv.html
deleted file mode 100644
index 3298313..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Allgatherv.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Allgatherv</title>
-<body>
-<H3>MPI_Allgatherv</H3>
-<PRE>
-int MPI_Allgatherv(void* , int, MPI_Datatype, void*, int *, int *, MPI_Datatype, MPI_Comm);
-</PRE>
-<DL><DD>
-Collects messages from each task and distributes the resulting message to all tasks. Messages can have variable sizes and displacements.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Alloc_mem.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Alloc_mem.html
deleted file mode 100644
index 60044b3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Alloc_mem.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Alloc_mem</title>
-<body>
-<H3>MPI_Alloc_mem</H3>
-<PRE>
-int MPI_Alloc_mem(MPI_Aint, MPI_Info info, void *baseptr);
-</PRE>
-<DL><DD>
-Allocates storage and returns a pointer to it.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Allreduce.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Allreduce.html
deleted file mode 100644
index 53e6cba..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Allreduce.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Allreduce</title>
-<body>
-<H3>MPI_Allreduce</H3>
-<PRE>
-int MPI_Allreduce(void* , void*, int, MPI_Datatype, MPI_Op, MPI_Comm);
-</PRE>
-<DL><DD>
-Applies a reduction operation.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Alltoall.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Alltoall.html
deleted file mode 100644
index b6f73b3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Alltoall.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Alltoall</title>
-<body>
-<H3>MPI_Alltoall</H3>
-<PRE>
-int MPI_Alltoall(void* , int, MPI_Datatype, void*, int, MPI_Datatype, MPI_Comm);
-</PRE>
-<DL><DD>
-Sends a distinct message from each task to every task.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Alltoallv.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Alltoallv.html
deleted file mode 100644
index 0f59951..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Alltoallv.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Alltoallv</title>
-<body>
-<H3>MPI_Alltoallv</H3>
-<PRE>
-int MPI_Alltoallv(void* , int *, int *, MPI_Datatype, void*, int *, int *, MPI_Datatype, MPI_Comm);
-</PRE>
-<DL><DD>
-Sends a distinct message from each task to every task. Messages can have different sizes and displacements.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Alltoallw.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Alltoallw.html
deleted file mode 100644
index 3fa106a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Alltoallw.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Alltoallw</title>
-<body>
-<H3>MPI_Alltoallw</H3>
-<PRE>
-int MPI_Alltoallw(void *, int [], int [], MPI_Datatype [], void *, int [], int [], MPI_Datatype [], MPI_Comm);
-</PRE>
-<DL><DD>
-Sends a distinct message from each task to every task. Messages can have different datatypes, sizes, and displacements.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Attr_delete.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Attr_delete.html
deleted file mode 100644
index d3e4745..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Attr_delete.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Attr_delete</title>
-<body>
-<H3>MPI_Attr_delete</H3>
-<PRE>
-int MPI_Attr_delete(MPI_Comm, int);
-</PRE>
-<DL><DD>
-Removes an attribute value from a communicator.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Attr_get.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Attr_get.html
deleted file mode 100644
index 5d7faf9..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Attr_get.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Attr_get</title>
-<body>
-<H3>MPI_Attr_get</H3>
-<PRE>
-int MPI_Attr_get(MPI_Comm, int, void *, int *);
-</PRE>
-<DL><DD>
-Retrieves an attribute value from a communicator.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Attr_put.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Attr_put.html
deleted file mode 100644
index fdec11d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Attr_put.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Attr_put</title>
-<body>
-<H3>MPI_Attr_put</H3>
-<PRE>
-int MPI_Attr_put(MPI_Comm, int, void*);
-</PRE>
-<DL><DD>
-Associates an attribute value with a communicator.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Barrier.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Barrier.html
deleted file mode 100644
index 70e9c7b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Barrier.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Barrier</title>
-<body>
-<H3>MPI_Barrier</H3>
-<PRE>
-int MPI_Barrier(MPI_Comm );
-</PRE>
-<DL><DD>
-Blocks each task until all tasks have called it.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Bcast.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Bcast.html
deleted file mode 100644
index 720372d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Bcast.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Bcast</title>
-<body>
-<H3>MPI_Bcast</H3>
-<PRE>
-int MPI_Bcast(void*, int, MPI_Datatype, int, MPI_Comm );
-</PRE>
-<DL><DD>
-Broadcasts a message from root to all tasks in the group.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Bsend.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Bsend.html
deleted file mode 100644
index ba467d4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Bsend.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Bsend</title>
-<body>
-<H3>MPI_Bsend</H3>
-<PRE>
-int MPI_Bsend(void*, int, MPI_Datatype, int, int, MPI_Comm);
-</PRE>
-<DL><DD>
-Performs a blocking buffered mode send operation.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Bsend_init.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Bsend_init.html
deleted file mode 100644
index 46213aa..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Bsend_init.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Bsend_init</title>
-<body>
-<H3>MPI_Bsend_init</H3>
-<PRE>
-int MPI_Bsend_init(void*, int, MPI_Datatype, int,int, MPI_Comm, MPI_Request *);
-</PRE>
-<DL><DD>
-Creates a persistent buffered mode send request.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Buffer_attach.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Buffer_attach.html
deleted file mode 100644
index a95bfc0..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Buffer_attach.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Buffer_attach</title>
-<body>
-<H3>MPI_Buffer_attach</H3>
-<PRE>
-int MPI_Buffer_attach( void*, int);
-</PRE>
-<DL><DD>
-Provides MPI with a message buffer for sending.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Buffer_detach.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Buffer_detach.html
deleted file mode 100644
index 1e4a9b7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Buffer_detach.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Buffer_detach</title>
-<body>
-<H3>MPI_Buffer_detach</H3>
-<PRE>
-int MPI_Buffer_detach( void*, int *);
-</PRE>
-<DL><DD>
-Detaches the current buffer.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cancel.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cancel.html
deleted file mode 100644
index de5eb28..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cancel.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Cancel</title>
-<body>
-<H3>MPI_Cancel</H3>
-<PRE>
-int MPI_Cancel(MPI_Request *);
-</PRE>
-<DL><DD>
-Marks a non-blocking operation for cancellation.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_coords.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_coords.html
deleted file mode 100644
index 133ba48..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_coords.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Cart_coords</title>
-<body>
-<H3>MPI_Cart_coords</H3>
-<PRE>
-int MPI_Cart_coords(MPI_Comm, int, int, int *);
-</PRE>
-<DL><DD>
-Translates task rank in a communicator into Cartesian task coordinates.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_create.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_create.html
deleted file mode 100644
index ad070e6..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_create.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Cart_create</title>
-<body>
-<H3>MPI_Cart_create</H3>
-<PRE>
-int MPI_Cart_create(MPI_Comm, int, int *, int *, int, MPI_Comm *);
-</PRE>
-<DL><DD>
-Creates a communicator containing topology information.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_get.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_get.html
deleted file mode 100644
index 450ef5b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_get.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Cart_get</title>
-<body>
-<H3>MPI_Cart_get</H3>
-<PRE>
-int MPI_Cart_get(MPI_Comm, int, int *, int *, int *);
-</PRE>
-<DL><DD>
-Retrieves Cartesian topology information from a communicator.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_map.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_map.html
deleted file mode 100644
index e7a7e75..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_map.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Cart_map</title>
-<body>
-<H3>MPI_Cart_map</H3>
-<PRE>
-int MPI_Cart_map(MPI_Comm, int, int *, int *, int *);
-</PRE>
-<DL><DD>
-Computes placement of tasks on the physical processor.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_rank.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_rank.html
deleted file mode 100644
index 7b57d25..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_rank.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Cart_rank</title>
-<body>
-<H3>MPI_Cart_rank</H3>
-<PRE>
-int MPI_Cart_rank(MPI_Comm, int *, int *);
-</PRE>
-<DL><DD>
-Translates task coordinates into a task rank.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_shift.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_shift.html
deleted file mode 100644
index 2664b38..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_shift.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Cart_shift</title>
-<body>
-<H3>MPI_Cart_shift</H3>
-<PRE>
-int MPI_Cart_shift(MPI_Comm, int, int, int *, int *);
-</PRE>
-<DL><DD>
-Returns shifted source and destination ranks for a task.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_sub.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_sub.html
deleted file mode 100644
index 46fb762..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cart_sub.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Cart_sub</title>
-<body>
-<H3>MPI_Cart_sub</H3>
-<PRE>
-int MPI_Cart_sub(MPI_Comm, int *, MPI_Comm *);
-</PRE>
-<DL><DD>
-Partitions a Cartesian communicator into lower-dimensional subgroups.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cartdim_get.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cartdim_get.html
deleted file mode 100644
index 64fda33..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Cartdim_get.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Cartdim_get</title>
-<body>
-<H3>MPI_Cartdim_get</H3>
-<PRE>
-int MPI_Cartdim_get(MPI_Comm, int *);
-</PRE>
-<DL><DD>
-Retrieves the number of Cartesian dimensions from a communicator.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_c2f.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_c2f.html
deleted file mode 100644
index 4fb1ca4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_c2f.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Comm_c2f</title>
-<body>
-<H3>MPI_Comm_c2f</H3>
-<PRE>
-MPI_Fint MPI_Comm_c2f(MPI_Comm);
-</PRE>
-<DL><DD>
-Translates a C communicator handle into a FORTRAN handle to the same communicator.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_call_errhandler.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_call_errhandler.html
deleted file mode 100644
index 1ed4455..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_call_errhandler.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Comm_call_errhandler</title>
-<body>
-<H3>MPI_Comm_call_errhandler</H3>
-<PRE>
-int MPI_Comm_call_errhandler(MPI_Comm, int);
-</PRE>
-<DL><DD>
-Calls the error handler assigned to the communicator with the error code supplied.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_compare.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_compare.html
deleted file mode 100644
index c59b064..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_compare.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Comm_compare</title>
-<body>
-<H3>MPI_Comm_compare</H3>
-<PRE>
-int MPI_Comm_compare(MPI_Comm, MPI_Comm, int *);
-</PRE>
-<DL><DD>
-Compares the groups and contexts of two communicators.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_create.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_create.html
deleted file mode 100644
index f1117a9..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_create.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Comm_create</title>
-<body>
-<H3>MPI_Comm_create</H3>
-<PRE>
-int MPI_Comm_create(MPI_Comm, MPI_Group, MPI_Comm *);
-</PRE>
-<DL><DD>
-Creates a new communicator with a given group.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_create_errhandler.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_create_errhandler.html
deleted file mode 100644
index c268ee4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_create_errhandler.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Comm_create_errhandler</title>
-<body>
-<H3>MPI_Comm_create_errhandler</H3>
-<PRE>
-int MPI_Comm_create_errhandler(MPI_Comm_errhandler_fn *, MPI_Errhandler *);
-</PRE>
-<DL><DD>
-Creates an error handler that can be attached to communicators.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_create_keyval.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_create_keyval.html
deleted file mode 100644
index e8b1b42..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_create_keyval.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Comm_create_keyval</title>
-<body>
-<H3>MPI_Comm_create_keyval</H3>
-<PRE>
-int MPI_Comm_create_keyval(MPI_Comm_copy_attr_function *, MPI_Comm_delete_attr_function *, int *, void *);
-</PRE>
-<DL><DD>
-Generates a new communicator attribute key.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_delete_attr.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_delete_attr.html
deleted file mode 100644
index b19817a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_delete_attr.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Comm_delete_attr</title>
-<body>
-<H3>MPI_Comm_delete_attr</H3>
-<PRE>
-int MPI_Comm_delete_attr(MPI_Comm, int);
-</PRE>
-<DL><DD>
-Removes an attribute value from a communicator.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_dup.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_dup.html
deleted file mode 100644
index d9a9bce..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_dup.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Comm_dup</title>
-<body>
-<H3>MPI_Comm_dup</H3>
-<PRE>
-int MPI_Comm_dup(MPI_Comm, MPI_Comm *);
-</PRE>
-<DL><DD>
-Creates a new communicator that is a duplicate of an existing communicator.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_f2c.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_f2c.html
deleted file mode 100644
index 5bf2b4b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_f2c.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Comm_f2c</title>
-<body>
-<H3>MPI_Comm_f2c</H3>
-<PRE>
-MPI_Comm MPI_Comm_f2c(MPI_Fint);
-</PRE>
-<DL><DD>
-Returns a C handle to a communicator.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_free.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_free.html
deleted file mode 100644
index a58e250..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_free.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Comm_free</title>
-<body>
-<H3>MPI_Comm_free</H3>
-<PRE>
-int MPI_Comm_free(MPI_Comm *);
-</PRE>
-<DL><DD>
-Marks a communicator for deallocation.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_free_keyval.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_free_keyval.html
deleted file mode 100644
index ccd60fe..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_free_keyval.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Comm_free_keyval</title>
-<body>
-<H3>MPI_Comm_free_keyval</H3>
-<PRE>
-int MPI_Comm_free_keyval(int *);
-</PRE>
-<DL><DD>
-Marks a communicator attribute key for deallocation.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_get_attr.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_get_attr.html
deleted file mode 100644
index db90ded..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_get_attr.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Comm_get_attr</title>
-<body>
-<H3>MPI_Comm_get_attr</H3>
-<PRE>
-int MPI_Comm_get_attr(MPI_Comm, int, void *, int *);
-</PRE>
-<DL><DD>
-Retrieves the communicator attribute value identified by the key.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_get_errhandler.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_get_errhandler.html
deleted file mode 100644
index 12d1811..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_get_errhandler.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Comm_get_errhandler</title>
-<body>
-<H3>MPI_Comm_get_errhandler</H3>
-<PRE>
-int MPI_Comm_get_errhandler(MPI_Comm, MPI_Errhandler *);
-</PRE>
-<DL><DD>
-Retrieves the error handler currently associated with a communicator.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_get_name.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_get_name.html
deleted file mode 100644
index b037c64..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_get_name.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Comm_get_name</title>
-<body>
-<H3>MPI_Comm_get_name</H3>
-<PRE>
-int MPI_Comm_get_name(MPI_Comm, char *, int *);
-</PRE>
-<DL><DD>
-Returns the name that was last associated with a communicator.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_group.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_group.html
deleted file mode 100644
index c34ff7b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_group.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Comm_group</title>
-<body>
-<H3>MPI_Comm_group</H3>
-<PRE>
-int MPI_Comm_group(MPI_Comm, MPI_Group *);
-</PRE>
-<DL><DD>
-Returns the group handle associated with a communicator.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_rank.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_rank.html
deleted file mode 100644
index 03c92b4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_rank.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Comm_rank</title>
-<body>
-<H3>MPI_Comm_rank</H3>
-<PRE>
-int MPI_Comm_rank(MPI_Comm, int *);
-</PRE>
-<DL><DD>
-Returns the rank of the local task in the group associated with a communicator.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_remote_group.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_remote_group.html
deleted file mode 100644
index baa9ba4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_remote_group.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Comm_remote_group</title>
-<body>
-<H3>MPI_Comm_remote_group</H3>
-<PRE>
-int MPI_Comm_remote_group(MPI_Comm, MPI_Group *);
-</PRE>
-<DL><DD>
-Returns the handle of the remote group of an inter-communicator.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_remote_size.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_remote_size.html
deleted file mode 100644
index 1449b11..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_remote_size.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Comm_remote_size</title>
-<body>
-<H3>MPI_Comm_remote_size</H3>
-<PRE>
-int MPI_Comm_remote_size(MPI_Comm, int *);
-</PRE>
-<DL><DD>
-Returns the size of the remote group of an inter-communicator.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_set_attr.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_set_attr.html
deleted file mode 100644
index 4c9570d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_set_attr.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Comm_set_attr</title>
-<body>
-<H3>MPI_Comm_set_attr</H3>
-<PRE>
-int MPI_Comm_set_attr(MPI_Comm, int, void *);
-</PRE>
-<DL><DD>
-Attaches the communicator attribute value to the communicator and associates it with the key.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_set_errhandler.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_set_errhandler.html
deleted file mode 100644
index a95ab79..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_set_errhandler.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Comm_set_errhandler</title>
-<body>
-<H3>MPI_Comm_set_errhandler</H3>
-<PRE>
-int MPI_Comm_set_errhandler(MPI_Comm, MPI_Errhandler);
-</PRE>
-<DL><DD>
-Attaches a new error handler to a communicator.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_set_name.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_set_name.html
deleted file mode 100644
index 88df8da..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_set_name.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Comm_set_name</title>
-<body>
-<H3>MPI_Comm_set_name</H3>
-<PRE>
-int MPI_Comm_set_name(MPI_Comm, char *);
-</PRE>
-<DL><DD>
-Associates a name string with a communicator.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_size.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_size.html
deleted file mode 100644
index 7120b62..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_size.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Comm_size</title>
-<body>
-<H3>MPI_Comm_size</H3>
-<PRE>
-int MPI_Comm_size(MPI_Comm, int *);
-</PRE>
-<DL><DD>
-Returns the size of the group associated with a communicator.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_split.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_split.html
deleted file mode 100644
index 73dcba8..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_split.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Comm_split</title>
-<body>
-<H3>MPI_Comm_split</H3>
-<PRE>
-int MPI_Comm_split(MPI_Comm, int, int, MPI_Comm *);
-</PRE>
-<DL><DD>
-Splits a communicator into multiple communicators based on color andkey.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_test_inter.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_test_inter.html
deleted file mode 100644
index f5f693e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Comm_test_inter.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Comm_test_inter</title>
-<body>
-<H3>MPI_Comm_test_inter</H3>
-<PRE>
-int MPI_Comm_test_inter(MPI_Comm, int *);
-</PRE>
-<DL><DD>
-Returns the type of a communicator (intra-communicator or inter-communicator).
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Dims_create.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Dims_create.html
deleted file mode 100644
index 2109d2b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Dims_create.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Dims_create</title>
-<body>
-<H3>MPI_Dims_create</H3>
-<PRE>
-int MPI_Dims_create(int, int, int *);
-</PRE>
-<DL><DD>
-Defines a Cartesian grid to balance tasks.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Errhandler_create.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Errhandler_create.html
deleted file mode 100644
index d508745..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Errhandler_create.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Errhandler_create</title>
-<body>
-<H3>MPI_Errhandler_create</H3>
-<PRE>
-int MPI_Errhandler_create(MPI_Handler_function *, MPI_Errhandler *);
-</PRE>
-<DL><DD>
-Registers a user-defined error handler.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Errhandler_free.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Errhandler_free.html
deleted file mode 100644
index e053892..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Errhandler_free.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Errhandler_free</title>
-<body>
-<H3>MPI_Errhandler_free</H3>
-<PRE>
-int MPI_Errhandler_free(MPI_Errhandler *);
-</PRE>
-<DL><DD>
-Marks an error handler for deallocation.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Errhandler_get.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Errhandler_get.html
deleted file mode 100644
index 797bb95..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Errhandler_get.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Errhandler_get</title>
-<body>
-<H3>MPI_Errhandler_get</H3>
-<PRE>
-int MPI_Errhandler_get(MPI_Comm, MPI_Errhandler *);
-</PRE>
-<DL><DD>
-Gets an error handler associated with a communicator.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Errhandler_set.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Errhandler_set.html
deleted file mode 100644
index 06df29b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Errhandler_set.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Errhandler_set</title>
-<body>
-<H3>MPI_Errhandler_set</H3>
-<PRE>
-int MPI_Errhandler_set(MPI_Comm, MPI_Errhandler);
-</PRE>
-<DL><DD>
-Associates a new error handler with a communicator.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Error_class.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Error_class.html
deleted file mode 100644
index 97e3c91..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Error_class.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Error_class</title>
-<body>
-<H3>MPI_Error_class</H3>
-<PRE>
-int MPI_Error_class(int, int *);
-</PRE>
-<DL><DD>
-Returns the error class for the corresponding error code.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Error_string.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Error_string.html
deleted file mode 100644
index 44bf8c1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Error_string.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Error_string</title>
-<body>
-<H3>MPI_Error_string</H3>
-<PRE>
-int MPI_Error_string(int, char *, int *);
-</PRE>
-<DL><DD>
-Returns the error string for a given error code.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Exscan.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Exscan.html
deleted file mode 100644
index ed53e66..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Exscan.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Exscan</title>
-<body>
-<H3>MPI_Exscan</H3>
-<PRE>
-int MPI_Exscan(void *, void *, int, MPI_Datatype, MPI_Op, MPI_Comm) ;/* External Interfaces */int MPI_Add_error_class(int *);
-</PRE>
-<DL><DD>
-Performs a prefix reduction on data distributed across the group.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_c2f.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_c2f.html
deleted file mode 100644
index 1c01c47..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_c2f.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_File_c2f</title>
-<body>
-<H3>MPI_File_c2f</H3>
-<PRE>
-MPI_Fint MPI_File_c2f(MPI_File);
-</PRE>
-<DL><DD>
-Translates a C file handle into a FORTRAN handle to the same file.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_call_errhandler.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_call_errhandler.html
deleted file mode 100644
index d4051cf..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_call_errhandler.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_File_call_errhandler</title>
-<body>
-<H3>MPI_File_call_errhandler</H3>
-<PRE>
-int MPI_File_call_errhandler(MPI_File, int);
-</PRE>
-<DL><DD>
-Calls the error handler assigned to the file with the error code supplied.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_create_errhandler.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_create_errhandler.html
deleted file mode 100644
index d2eb7b3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_create_errhandler.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_File_create_errhandler</title>
-<body>
-<H3>MPI_File_create_errhandler</H3>
-<PRE>
-int MPI_File_create_errhandler(MPI_File_errhandler_fn *, MPI_Errhandler *);
-</PRE>
-<DL><DD>
-Registers a user-defined error handler that you can associate with an open file.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_f2c.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_f2c.html
deleted file mode 100644
index 8b47cd7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_f2c.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_File_f2c</title>
-<body>
-<H3>MPI_File_f2c</H3>
-<PRE>
-MPI_File MPI_File_f2c(MPI_Fint);
-</PRE>
-<DL><DD>
-Returns a C handle to a file.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_get_errhandler.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_get_errhandler.html
deleted file mode 100644
index 5355d3e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_get_errhandler.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_File_get_errhandler</title>
-<body>
-<H3>MPI_File_get_errhandler</H3>
-<PRE>
-int MPI_File_get_errhandler(MPI_File, MPI_Errhandler *);
-</PRE>
-<DL><DD>
-Retrieves the error handler currently associated with a file handle.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_set_errhandler.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_set_errhandler.html
deleted file mode 100644
index bffe583..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_File_set_errhandler.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_File_set_errhandler</title>
-<body>
-<H3>MPI_File_set_errhandler</H3>
-<PRE>
-int MPI_File_set_errhandler(MPI_File, MPI_Errhandler);
-</PRE>
-<DL><DD>
-Associates a new error handler with a file.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Finalize.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Finalize.html
deleted file mode 100644
index 45df8f6..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Finalize.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Finalize</title>
-<body>
-<H3>MPI_Finalize</H3>
-<PRE>
-int MPI_Finalize(void);
-</PRE>
-<DL><DD>
-Terminates all MPI processing.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Finalized.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Finalized.html
deleted file mode 100644
index 104c44e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Finalized.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Finalized</title>
-<body>
-<H3>MPI_Finalized</H3>
-<PRE>
-int MPI_Finalized(int *);
-</PRE>
-<DL><DD>
-Returns true if MPI_FINALIZE has completed.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Free_mem.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Free_mem.html
deleted file mode 100644
index f14c462..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Free_mem.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Free_mem</title>
-<body>
-<H3>MPI_Free_mem</H3>
-<PRE>
-int MPI_Free_mem(void *);
-</PRE>
-<DL><DD>
-Frees a block of storage.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Gather.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Gather.html
deleted file mode 100644
index 87811c3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Gather.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Gather</title>
-<body>
-<H3>MPI_Gather</H3>
-<PRE>
-int MPI_Gather(void* , int, MPI_Datatype, void*, int, MPI_Datatype, int, MPI_Comm); int MPI_Gatherv(void* , int, MPI_Datatype, void*, int *, int *, MPI_Datatype, int, MPI_Comm);int MPI_Scatter(void* , int, MPI_Datatype, void*, int, MPI_Datatype, int, MPI_Comm);
-</PRE>
-<DL><DD>
-Collects individual messages from each task in a group at the root task.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Gatherv.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Gatherv.html
deleted file mode 100644
index cc46db3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Gatherv.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Gatherv</title>
-<body>
-<H3>MPI_Gatherv</H3>
-<PRE>
-int MPI_Gatherv(void* , int, MPI_Datatype, void*, int *, int *, MPI_Datatype, int, MPI_Comm); int MPI_Scatter(void* , int, MPI_Datatype, void*, int, MPI_Datatype, int, MPI_Comm);
-</PRE>
-<DL><DD>
-Collects individual messages from each task incomm at the root task. Messages can have different sizes and displacements.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get.html
deleted file mode 100644
index 6e409dc..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Get</title>
-<body>
-<H3>MPI_Get</H3>
-<PRE>
-int MPI_Get(void *, int, MPI_Datatype, int, MPI_Aint, int, MPI_Datatype, MPI_Win);
-</PRE>
-<DL><DD>
-Transfers data from a window at the target task to the origin task.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get_address.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get_address.html
deleted file mode 100644
index ea55ed0..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get_address.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Get_address</title>
-<body>
-<H3>MPI_Get_address</H3>
-<PRE>
-int MPI_Get_address(void *, MPI_Aint *);
-</PRE>
-<DL><DD>
-Returns the address of a location in memory.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get_count.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get_count.html
deleted file mode 100644
index be80aa3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get_count.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Get_count</title>
-<body>
-<H3>MPI_Get_count</H3>
-<PRE>
-int MPI_Get_count(MPI_Status *, MPI_Datatype, int *);
-</PRE>
-<DL><DD>
-Returns the number of elements in a message.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get_elements.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get_elements.html
deleted file mode 100644
index e2b623d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get_elements.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Get_elements</title>
-<body>
-<H3>MPI_Get_elements</H3>
-<PRE>
-int MPI_Get_elements(MPI_Status *, MPI_Datatype, int *);
-</PRE>
-<DL><DD>
-Returns the number of basic elements in a message.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get_processor_name.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get_processor_name.html
deleted file mode 100644
index 286de86..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get_processor_name.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Get_processor_name</title>
-<body>
-<H3>MPI_Get_processor_name</H3>
-<PRE>
-int MPI_Get_processor_name(char *, int *);
-</PRE>
-<DL><DD>
-Returns the name of the local processor.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get_version.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get_version.html
deleted file mode 100644
index 16cfbe5..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Get_version.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Get_version</title>
-<body>
-<H3>MPI_Get_version</H3>
-<PRE>
-int MPI_Get_version(int *, int *);
-</PRE>
-<DL><DD>
-Returns the version of the MPI standard supported.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graph_create.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graph_create.html
deleted file mode 100644
index ebb00cb..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graph_create.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Graph_create</title>
-<body>
-<H3>MPI_Graph_create</H3>
-<PRE>
-int MPI_Graph_create(MPI_Comm, int, int *, int *, int, MPI_Comm *);
-</PRE>
-<DL><DD>
-Creates a new communicator containing graph topology information.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graph_get.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graph_get.html
deleted file mode 100644
index a5c85fa..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graph_get.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Graph_get</title>
-<body>
-<H3>MPI_Graph_get</H3>
-<PRE>
-int MPI_Graph_get(MPI_Comm, int, int, int *, int *);
-</PRE>
-<DL><DD>
-Retrieves graph topology information from a communicator.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graph_map.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graph_map.html
deleted file mode 100644
index 938afe3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graph_map.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Graph_map</title>
-<body>
-<H3>MPI_Graph_map</H3>
-<PRE>
-int MPI_Graph_map(MPI_Comm, int, int *, int *, int *);
-</PRE>
-<DL><DD>
-Computes placement of tasks on the physical processor.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graph_neighbors.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graph_neighbors.html
deleted file mode 100644
index 50c8fba..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graph_neighbors.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Graph_neighbors</title>
-<body>
-<H3>MPI_Graph_neighbors</H3>
-<PRE>
-int MPI_Graph_neighbors(MPI_Comm, int, int, int *);
-</PRE>
-<DL><DD>
-Returns the neighbors of the given task.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graph_neighbors_count.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graph_neighbors_count.html
deleted file mode 100644
index e54a041..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graph_neighbors_count.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Graph_neighbors_count</title>
-<body>
-<H3>MPI_Graph_neighbors_count</H3>
-<PRE>
-int MPI_Graph_neighbors_count(MPI_Comm, int, int *);
-</PRE>
-<DL><DD>
-Returns the number of neighbors of the given task.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graphdims_get.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graphdims_get.html
deleted file mode 100644
index d0fb61a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Graphdims_get.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Graphdims_get</title>
-<body>
-<H3>MPI_Graphdims_get</H3>
-<PRE>
-int MPI_Graphdims_get(MPI_Comm, int *, int *);
-</PRE>
-<DL><DD>
-Retrieves graph topology information from a communicator.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Grequest_complete.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Grequest_complete.html
deleted file mode 100644
index 1e93d81..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Grequest_complete.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Grequest_complete</title>
-<body>
-<H3>MPI_Grequest_complete</H3>
-<PRE>
-int MPI_Grequest_complete(MPI_Request);
-</PRE>
-<DL><DD>
-Marks the generalized request complete.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Grequest_start.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Grequest_start.html
deleted file mode 100644
index c987abd..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Grequest_start.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Grequest_start</title>
-<body>
-<H3>MPI_Grequest_start</H3>
-<PRE>
-int MPI_Grequest_start(MPI_Grequest_query_function *, MPI_Grequest_free_function *,MPI_Grequest_cancel_function *, void *, MPI_Request *);
-</PRE>
-<DL><DD>
-Initializes a generalized request.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_c2f.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_c2f.html
deleted file mode 100644
index cd34e5c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_c2f.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Group_c2f</title>
-<body>
-<H3>MPI_Group_c2f</H3>
-<PRE>
-MPI_Fint MPI_Group_c2f(MPI_Group);
-</PRE>
-<DL><DD>
-Translates a C group handle into a FORTRAN handle to the same group.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_compare.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_compare.html
deleted file mode 100644
index b84573d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_compare.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Group_compare</title>
-<body>
-<H3>MPI_Group_compare</H3>
-<PRE>
-int MPI_Group_compare(MPI_Group, MPI_Group, int *);
-</PRE>
-<DL><DD>
-Compares the contents of two task groups.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_difference.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_difference.html
deleted file mode 100644
index 3145398..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_difference.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Group_difference</title>
-<body>
-<H3>MPI_Group_difference</H3>
-<PRE>
-int MPI_Group_difference(MPI_Group, MPI_Group, MPI_Group *);
-</PRE>
-<DL><DD>
-Creates a new group that is the difference of two existing groups.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_excl.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_excl.html
deleted file mode 100644
index ae639a7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_excl.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Group_excl</title>
-<body>
-<H3>MPI_Group_excl</H3>
-<PRE>
-int MPI_Group_excl(MPI_Group, int, int *, MPI_Group *);
-</PRE>
-<DL><DD>
-Removes selected tasks from an existing group to create a new group.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_f2c.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_f2c.html
deleted file mode 100644
index 0e576c3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_f2c.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Group_f2c</title>
-<body>
-<H3>MPI_Group_f2c</H3>
-<PRE>
-MPI_Group MPI_Group_f2c(MPI_Fint);
-</PRE>
-<DL><DD>
-Returns a C handle to a group.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_free.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_free.html
deleted file mode 100644
index c686b0a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_free.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Group_free</title>
-<body>
-<H3>MPI_Group_free</H3>
-<PRE>
-int MPI_Group_free(MPI_Group *);
-</PRE>
-<DL><DD>
-Marks a group for deallocation.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_incl.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_incl.html
deleted file mode 100644
index d549350..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_incl.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Group_incl</title>
-<body>
-<H3>MPI_Group_incl</H3>
-<PRE>
-int MPI_Group_incl(MPI_Group, int, int *, MPI_Group *);
-</PRE>
-<DL><DD>
-Creates a new group consisting of selected tasks from an existing group.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_intersection.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_intersection.html
deleted file mode 100644
index 8f291c4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_intersection.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Group_intersection</title>
-<body>
-<H3>MPI_Group_intersection</H3>
-<PRE>
-int MPI_Group_intersection(MPI_Group, MPI_Group, MPI_Group *);
-</PRE>
-<DL><DD>
-Creates a new group that is the intersection of two existing groups.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_range_excl.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_range_excl.html
deleted file mode 100644
index 2b633d4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_range_excl.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Group_range_excl</title>
-<body>
-<H3>MPI_Group_range_excl</H3>
-<PRE>
-int MPI_Group_range_excl(MPI_Group, int, int [][3], MPI_Group *);
-</PRE>
-<DL><DD>
-Creates a new group by excluding selected tasks of an existing group.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_range_incl.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_range_incl.html
deleted file mode 100644
index 47c1175..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_range_incl.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Group_range_incl</title>
-<body>
-<H3>MPI_Group_range_incl</H3>
-<PRE>
-int MPI_Group_range_incl(MPI_Group, int, int [][3], MPI_Group *);
-</PRE>
-<DL><DD>
-Creates a new group consisting of selected ranges of tasks from an existing group.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_rank.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_rank.html
deleted file mode 100644
index 15b143b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_rank.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Group_rank</title>
-<body>
-<H3>MPI_Group_rank</H3>
-<PRE>
-int MPI_Group_rank(MPI_Group, int *);
-</PRE>
-<DL><DD>
-Returns the rank of the local task with respect to group.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_size.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_size.html
deleted file mode 100644
index 583f01c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_size.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Group_size</title>
-<body>
-<H3>MPI_Group_size</H3>
-<PRE>
-int MPI_Group_size(MPI_Group, int *);
-</PRE>
-<DL><DD>
-Returns the number of tasks in a group.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_union.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_union.html
deleted file mode 100644
index 3f2d6b5..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Group_union.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Group_union</title>
-<body>
-<H3>MPI_Group_union</H3>
-<PRE>
-int MPI_Group_union(MPI_Group, MPI_Group, MPI_Group *);
-</PRE>
-<DL><DD>
-Creates a new group that is the union of two existing groups.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Ibsend.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Ibsend.html
deleted file mode 100644
index 87e4253..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Ibsend.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Ibsend</title>
-<body>
-<H3>MPI_Ibsend</H3>
-<PRE>
-int MPI_Ibsend(void*, int, MPI_Datatype, int, int, MPI_Comm, MPI_Request *);
-</PRE>
-<DL><DD>
-Performs a non-blocking buffered send.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_c2f.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_c2f.html
deleted file mode 100644
index 6583148..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_c2f.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Info_c2f</title>
-<body>
-<H3>MPI_Info_c2f</H3>
-<PRE>
-MPI_Fint MPI_Info_c2f(MPI_Info);
-</PRE>
-<DL><DD>
-Translates a C Info object handle into a FORTRAN handle to the same Info object.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_create.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_create.html
deleted file mode 100644
index 376f340..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_create.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Info_create</title>
-<body>
-<H3>MPI_Info_create</H3>
-<PRE>
-int MPI_Info_create(MPI_Info *);
-</PRE>
-<DL><DD>
-Creates a new, empty Info object.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_delete.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_delete.html
deleted file mode 100644
index 7f9312c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_delete.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Info_delete</title>
-<body>
-<H3>MPI_Info_delete</H3>
-<PRE>
-int MPI_Info_delete(MPI_Info, char *);
-</PRE>
-<DL><DD>
-Deletes a (key, value) pair from an Info object.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_dup.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_dup.html
deleted file mode 100644
index a72aab6..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_dup.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Info_dup</title>
-<body>
-<H3>MPI_Info_dup</H3>
-<PRE>
-int MPI_Info_dup(MPI_Info, MPI_Info *);
-</PRE>
-<DL><DD>
-Duplicates an Info object.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_f2c.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_f2c.html
deleted file mode 100644
index aba8c54..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_f2c.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Info_f2c</title>
-<body>
-<H3>MPI_Info_f2c</H3>
-<PRE>
-MPI_Info MPI_Info_f2c(MPI_Fint);
-</PRE>
-<DL><DD>
-Returns a C handle to an Info object.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_free.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_free.html
deleted file mode 100644
index af6af50..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_free.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Info_free</title>
-<body>
-<H3>MPI_Info_free</H3>
-<PRE>
-int MPI_Info_free(MPI_Info *info);
-</PRE>
-<DL><DD>
-Frees an Info object and sets its handle to MPI_INFO_NULL.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_get.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_get.html
deleted file mode 100644
index e6eee16..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_get.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Info_get</title>
-<body>
-<H3>MPI_Info_get</H3>
-<PRE>
-int MPI_Info_get(MPI_Info, char *, int, char *, int *);
-</PRE>
-<DL><DD>
-Retrieves the value associated withkey in an Info object.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_get_nkeys.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_get_nkeys.html
deleted file mode 100644
index 0a073ad..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_get_nkeys.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Info_get_nkeys</title>
-<body>
-<H3>MPI_Info_get_nkeys</H3>
-<PRE>
-int MPI_Info_get_nkeys(MPI_Info, int *);
-</PRE>
-<DL><DD>
-Returns the number of keys defined in an Info object.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_get_nthkey.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_get_nthkey.html
deleted file mode 100644
index 5a8fdcd..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_get_nthkey.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Info_get_nthkey</title>
-<body>
-<H3>MPI_Info_get_nthkey</H3>
-<PRE>
-int MPI_Info_get_nthkey(MPI_Info, int, char *);
-</PRE>
-<DL><DD>
-Retrieves the nth key defined in an Info object.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_get_valuelen.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_get_valuelen.html
deleted file mode 100644
index d112a0a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_get_valuelen.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Info_get_valuelen</title>
-<body>
-<H3>MPI_Info_get_valuelen</H3>
-<PRE>
-int MPI_Info_get_valuelen(MPI_Info, char *, int *, int *);
-</PRE>
-<DL><DD>
-Retrieves the length of the value associated with a key of an Info object.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_set.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_set.html
deleted file mode 100644
index 9298819..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Info_set.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Info_set</title>
-<body>
-<H3>MPI_Info_set</H3>
-<PRE>
-int MPI_Info_set(MPI_Info, char *, char *);
-</PRE>
-<DL><DD>
-Adds a (key, value) pair to an Info object.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Init.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Init.html
deleted file mode 100644
index 198a38a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Init.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Init</title>
-<body>
-<H3>MPI_Init</H3>
-<PRE>
-int MPI_Init(int *, char ***);
-</PRE>
-<DL><DD>
-Initializes MPI.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Init_thread.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Init_thread.html
deleted file mode 100644
index 19074d1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Init_thread.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Init_thread</title>
-<body>
-<H3>MPI_Init_thread</H3>
-<PRE>
-int MPI_Init_thread(int *, char ***, int, int *);
-</PRE>
-<DL><DD>
-Initializes MPI and the MPI threads environment.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Initialized.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Initialized.html
deleted file mode 100644
index 4da88eb..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Initialized.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Initialized</title>
-<body>
-<H3>MPI_Initialized</H3>
-<PRE>
-int MPI_Initialized(int *);
-</PRE>
-<DL><DD>
-Determines if MPI is initialized.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Intercomm_create.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Intercomm_create.html
deleted file mode 100644
index c15864b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Intercomm_create.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Intercomm_create</title>
-<body>
-<H3>MPI_Intercomm_create</H3>
-<PRE>
-int MPI_Intercomm_create(MPI_Comm, int, MPI_Comm, int, int, MPI_Comm * );
-</PRE>
-<DL><DD>
-Creates an inter-communicator from two intra-communicators.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Intercomm_merge.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Intercomm_merge.html
deleted file mode 100644
index 9c44f34..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Intercomm_merge.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Intercomm_merge</title>
-<body>
-<H3>MPI_Intercomm_merge</H3>
-<PRE>
-int MPI_Intercomm_merge(MPI_Comm, int, MPI_Comm *);
-</PRE>
-<DL><DD>
-Creates an intra-communicator by merging the local and remote groups of an inter-communicator.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Iprobe.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Iprobe.html
deleted file mode 100644
index 0456a2b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Iprobe.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Iprobe</title>
-<body>
-<H3>MPI_Iprobe</H3>
-<PRE>
-int MPI_Iprobe(int, int, MPI_Comm, int *, MPI_Status *);
-</PRE>
-<DL><DD>
-Checks to see if a message matchingsource, tag, andcomm has arrived.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Irecv.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Irecv.html
deleted file mode 100644
index 8f50be1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Irecv.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Irecv</title>
-<body>
-<H3>MPI_Irecv</H3>
-<PRE>
-int MPI_Irecv(void*, int, MPI_Datatype, int, int, MPI_Comm, MPI_Request *);
-</PRE>
-<DL><DD>
-Performs a non-blocking receive operation.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Irsend.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Irsend.html
deleted file mode 100644
index c0cb2f3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Irsend.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Irsend</title>
-<body>
-<H3>MPI_Irsend</H3>
-<PRE>
-int MPI_Irsend(void*, int, MPI_Datatype, int, int, MPI_Comm, MPI_Request *);
-</PRE>
-<DL><DD>
-Performs a non-blocking ready send operation.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Is_thread_main.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Is_thread_main.html
deleted file mode 100644
index 5aed047..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Is_thread_main.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Is_thread_main</title>
-<body>
-<H3>MPI_Is_thread_main</H3>
-<PRE>
-int MPI_Is_thread_main(int *);
-</PRE>
-<DL><DD>
-Determines whether the calling thread is the thread that called MPI_INIT or MPI_INIT_THREAD.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Isend.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Isend.html
deleted file mode 100644
index b71cef4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Isend.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Isend</title>
-<body>
-<H3>MPI_Isend</H3>
-<PRE>
-int MPI_Isend(void*, int, MPI_Datatype, int, int, MPI_Comm, MPI_Request *);
-</PRE>
-<DL><DD>
-Performs a non-blocking standard mode send operation.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Issend.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Issend.html
deleted file mode 100644
index 607ab26..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Issend.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Issend</title>
-<body>
-<H3>MPI_Issend</H3>
-<PRE>
-int MPI_Issend(void*, int, MPI_Datatype, int, int, MPI_Comm, MPI_Request *);
-</PRE>
-<DL><DD>
-Performs a non-blocking synchronous mode send operation.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Keyval_create.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Keyval_create.html
deleted file mode 100644
index 8914737..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Keyval_create.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Keyval_create</title>
-<body>
-<H3>MPI_Keyval_create</H3>
-<PRE>
-int MPI_Keyval_create(MPI_Copy_function *, MPI_Delete_function *, int *, void*);
-</PRE>
-<DL><DD>
-Generates a new communicator attribute key.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Keyval_free.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Keyval_free.html
deleted file mode 100644
index b6d3c4c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Keyval_free.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Keyval_free</title>
-<body>
-<H3>MPI_Keyval_free</H3>
-<PRE>
-int MPI_Keyval_free(int *);
-</PRE>
-<DL><DD>
-Marks a communicator attribute key for deallocation.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Op_c2f.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Op_c2f.html
deleted file mode 100644
index f81634f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Op_c2f.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Op_c2f</title>
-<body>
-<H3>MPI_Op_c2f</H3>
-<PRE>
-MPI_Fint MPI_Op_c2f(MPI_Op);
-</PRE>
-<DL><DD>
-Translates a C reduction operation handle into a FORTRAN handle to the same operation.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Op_create.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Op_create.html
deleted file mode 100644
index b74885e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Op_create.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Op_create</title>
-<body>
-<H3>MPI_Op_create</H3>
-<PRE>
-int MPI_Op_create(MPI_User_function *, int, MPI_Op *);
-</PRE>
-<DL><DD>
-Binds a user-defined reduction operation to anop handle.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Op_f2c.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Op_f2c.html
deleted file mode 100644
index 8aacfaa..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Op_f2c.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Op_f2c</title>
-<body>
-<H3>MPI_Op_f2c</H3>
-<PRE>
-MPI_Op MPI_Op_f2c(MPI_Fint);
-</PRE>
-<DL><DD>
-Returns a C reduction operation handle to an operation.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Op_free.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Op_free.html
deleted file mode 100644
index f12067d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Op_free.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Op_free</title>
-<body>
-<H3>MPI_Op_free</H3>
-<PRE>
-int MPI_Op_free( MPI_Op *);
-</PRE>
-<DL><DD>
-Marks a user-defined reduction operation for deallocation.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Pack.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Pack.html
deleted file mode 100644
index 181bce4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Pack.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Pack</title>
-<body>
-<H3>MPI_Pack</H3>
-<PRE>
-int MPI_Pack(void*, int, MPI_Datatype, void *, int, int *,  MPI_Comm);
-</PRE>
-<DL><DD>
-Packs the message in the specified send buffer into the specified buffer space.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Pack_external.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Pack_external.html
deleted file mode 100644
index dd908d4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Pack_external.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Pack_external</title>
-<body>
-<H3>MPI_Pack_external</H3>
-<PRE>
-int MPI_Pack_external(char *, void *, int, MPI_Datatype, void *, MPI_Aint, MPI_Aint *);int MPI_Pack_external_size(char *, int, MPI_Datatype, MPI_Aint *);int MPI_Request_get_status(MPI_Request, int *, MPI_Status *);
-</PRE>
-<DL><DD>
-Packs the message in the specified send buffer into the specified buffer space, using the external32 data format.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Pack_external_size.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Pack_external_size.html
deleted file mode 100644
index 1c3a19e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Pack_external_size.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Pack_external_size</title>
-<body>
-<H3>MPI_Pack_external_size</H3>
-<PRE>
-int MPI_Pack_external_size(char *, int, MPI_Datatype, MPI_Aint *); int MPI_Request_get_status(MPI_Request, int *, MPI_Status *);
-</PRE>
-<DL><DD>
-Returns the number of bytes required to hold the data, using the external32 data format.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Pack_size.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Pack_size.html
deleted file mode 100644
index c885077..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Pack_size.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Pack_size</title>
-<body>
-<H3>MPI_Pack_size</H3>
-<PRE>
-int MPI_Pack_size(int, MPI_Datatype, MPI_Comm, int *);
-</PRE>
-<DL><DD>
-Returns the number of bytes required to hold the data.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Pcontrol.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Pcontrol.html
deleted file mode 100644
index b307cac..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Pcontrol.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Pcontrol</title>
-<body>
-<H3>MPI_Pcontrol</H3>
-<PRE>
-int MPI_Pcontrol(const int, ...);
-</PRE>
-<DL><DD>
-Provides profile control.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Probe.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Probe.html
deleted file mode 100644
index 64c3467..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Probe.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Probe</title>
-<body>
-<H3>MPI_Probe</H3>
-<PRE>
-int MPI_Probe(int, int, MPI_Comm, MPI_Status *);
-</PRE>
-<DL><DD>
-Waits until a message matching source, tag, and comm arrives.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Put.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Put.html
deleted file mode 100644
index b71e768..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Put.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Put</title>
-<body>
-<H3>MPI_Put</H3>
-<PRE>
-int MPI_Put(void *, int, MPI_Datatype, int, MPI_Aint, int, MPI_Datatype, MPI_Win);
-</PRE>
-<DL><DD>
-Transfers data from the origin task to a window at the target task.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Query_thread.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Query_thread.html
deleted file mode 100644
index 1dceed1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Query_thread.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Query_thread</title>
-<body>
-<H3>MPI_Query_thread</H3>
-<PRE>
-int MPI_Query_thread(int *);
-</PRE>
-<DL><DD>
-Returns the current level of threads support.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Recv.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Recv.html
deleted file mode 100644
index 8c0ac7d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Recv.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Recv</title>
-<body>
-<H3>MPI_Recv</H3>
-<PRE>
-int MPI_Recv(void*, int, MPI_Datatype, int, int, MPI_Comm, MPI_Status *);
-</PRE>
-<DL><DD>
-Performs a blocking receive operation.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Recv_init.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Recv_init.html
deleted file mode 100644
index a3ccb7f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Recv_init.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Recv_init</title>
-<body>
-<H3>MPI_Recv_init</H3>
-<PRE>
-int MPI_Recv_init(void*, int, MPI_Datatype, int,int, MPI_Comm, MPI_Request *);
-</PRE>
-<DL><DD>
-Creates a persistent receive request.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Reduce.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Reduce.html
deleted file mode 100644
index eff782e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Reduce.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Reduce</title>
-<body>
-<H3>MPI_Reduce</H3>
-<PRE>
-int MPI_Reduce(void* , void*, int, MPI_Datatype, MPI_Op, int, MPI_Comm);
-</PRE>
-<DL><DD>
-Applies a reduction operation to the vectorsendbuf over the set of tasks specified bycomm and places the result in recvbuf on root.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Reduce_scatter.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Reduce_scatter.html
deleted file mode 100644
index 10344c0..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Reduce_scatter.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Reduce_scatter</title>
-<body>
-<H3>MPI_Reduce_scatter</H3>
-<PRE>
-int MPI_Reduce_scatter(void* , void*, int *, MPI_Datatype, MPI_Op, MPI_Comm);
-</PRE>
-<DL><DD>
-Applies a reduction operation to the vectorsendbuf over the set of tasks specified bycomm and scatters the result according to the values in recvcounts.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Request_c2f.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Request_c2f.html
deleted file mode 100644
index 25a1131..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Request_c2f.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Request_c2f</title>
-<body>
-<H3>MPI_Request_c2f</H3>
-<PRE>
-MPI_Fint MPI_Request_c2f(MPI_Request);
-</PRE>
-<DL><DD>
-Translates a C request handle into a FORTRAN handle to the same request.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Request_f2c.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Request_f2c.html
deleted file mode 100644
index da99ab0..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Request_f2c.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Request_f2c</title>
-<body>
-<H3>MPI_Request_f2c</H3>
-<PRE>
-MPI_Request MPI_Request_f2c(MPI_Fint);
-</PRE>
-<DL><DD>
-Returns a C handle to a request.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Request_free.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Request_free.html
deleted file mode 100644
index c4292e8..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Request_free.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Request_free</title>
-<body>
-<H3>MPI_Request_free</H3>
-<PRE>
-int MPI_Request_free(MPI_Request *);
-</PRE>
-<DL><DD>
-Marks a request for deallocation.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Request_get_status.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Request_get_status.html
deleted file mode 100644
index 48e6d53..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Request_get_status.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Request_get_status</title>
-<body>
-<H3>MPI_Request_get_status</H3>
-<PRE>
-int MPI_Request_get_status(MPI_Request, int *, MPI_Status *);
-</PRE>
-<DL><DD>
-Accesses the information associated with a request, without freeing the request.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Rsend.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Rsend.html
deleted file mode 100644
index 30570ad..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Rsend.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Rsend</title>
-<body>
-<H3>MPI_Rsend</H3>
-<PRE>
-int MPI_Rsend(void*, int, MPI_Datatype, int, int, MPI_Comm);
-</PRE>
-<DL><DD>
-Performs a blocking ready mode send operation.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Rsend_init.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Rsend_init.html
deleted file mode 100644
index f403c33..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Rsend_init.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Rsend_init</title>
-<body>
-<H3>MPI_Rsend_init</H3>
-<PRE>
-int MPI_Rsend_init(void*, int, MPI_Datatype, int,int, MPI_Comm, MPI_Request *);
-</PRE>
-<DL><DD>
-Creates a persistent ready mode send request.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Scan.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Scan.html
deleted file mode 100644
index 16a4b46..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Scan.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Scan</title>
-<body>
-<H3>MPI_Scan</H3>
-<PRE>
-int MPI_Scan(void* , void*, int, MPI_Datatype, MPI_Op, MPI_Comm );
-</PRE>
-<DL><DD>
-Performs a parallel prefix reduction on data distributed across a group.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Scatter.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Scatter.html
deleted file mode 100644
index b6bc740..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Scatter.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Scatter</title>
-<body>
-<H3>MPI_Scatter</H3>
-<PRE>
-int MPI_Scatter(void* , int, MPI_Datatype, void*, int, MPI_Datatype, int, MPI_Comm);
-</PRE>
-<DL><DD>
-Distributes individual messages fromroot to each task in comm.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Scatterv.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Scatterv.html
deleted file mode 100644
index f22122d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Scatterv.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Scatterv</title>
-<body>
-<H3>MPI_Scatterv</H3>
-<PRE>
-int MPI_Scatterv(void* , int *, int *,  MPI_Datatype, void*, int, MPI_Datatype, int, MPI_Comm);
-</PRE>
-<DL><DD>
-Distributes individual messages fromroot to each task in comm. Messages can have different sizes and displacements.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Send.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Send.html
deleted file mode 100644
index 32fe30d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Send.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Send</title>
-<body>
-<H3>MPI_Send</H3>
-<PRE>
-int MPI_Send(void*, int, MPI_Datatype, int, int, MPI_Comm);
-</PRE>
-<DL><DD>
-Blocking standard mode send.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Send_init.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Send_init.html
deleted file mode 100644
index 1bb6625..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Send_init.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Send_init</title>
-<body>
-<H3>MPI_Send_init</H3>
-<PRE>
-int MPI_Send_init(void*, int, MPI_Datatype, int, int, MPI_Comm, MPI_Request *);
-</PRE>
-<DL><DD>
-Creates a persistent standard mode send request.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Sendrecv.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Sendrecv.html
deleted file mode 100644
index 1eb3d14..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Sendrecv.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Sendrecv</title>
-<body>
-<H3>MPI_Sendrecv</H3>
-<PRE>
-int MPI_Sendrecv(void *, int, MPI_Datatype,int, int, void *, int, MPI_Datatype, int, int, MPI_Comm, MPI_Status *);
-</PRE>
-<DL><DD>
-Performs a blocking send and receive operation.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Sendrecv_replace.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Sendrecv_replace.html
deleted file mode 100644
index 950a191..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Sendrecv_replace.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Sendrecv_replace</title>
-<body>
-<H3>MPI_Sendrecv_replace</H3>
-<PRE>
-int MPI_Sendrecv_replace(void*, int, MPI_Datatype, int, int, int, int, MPI_Comm, MPI_Status *);
-</PRE>
-<DL><DD>
-Performs a blocking send and receive operation using a common buffer.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Ssend.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Ssend.html
deleted file mode 100644
index 7d79a6a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Ssend.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Ssend</title>
-<body>
-<H3>MPI_Ssend</H3>
-<PRE>
-int MPI_Ssend(void*, int, MPI_Datatype, int, int, MPI_Comm);
-</PRE>
-<DL><DD>
-Performs a blocking synchronous mode send operation.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Ssend_init.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Ssend_init.html
deleted file mode 100644
index cba5d26..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Ssend_init.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Ssend_init</title>
-<body>
-<H3>MPI_Ssend_init</H3>
-<PRE>
-int MPI_Ssend_init(void*, int, MPI_Datatype, int,int, MPI_Comm, MPI_Request *);
-</PRE>
-<DL><DD>
-Creates a persistent synchronous mode send request.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Start.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Start.html
deleted file mode 100644
index 8ed4aaf..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Start.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Start</title>
-<body>
-<H3>MPI_Start</H3>
-<PRE>
-int MPI_Start(MPI_Request *);
-</PRE>
-<DL><DD>
-Activates a persistent request operation.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Startall.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Startall.html
deleted file mode 100644
index 6c747e6..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Startall.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Startall</title>
-<body>
-<H3>MPI_Startall</H3>
-<PRE>
-int MPI_Startall(int, MPI_Request *);
-</PRE>
-<DL><DD>
-Activates a collection of persistent request operations.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Status_c2f.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Status_c2f.html
deleted file mode 100644
index 9fdec74..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Status_c2f.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Status_c2f</title>
-<body>
-<H3>MPI_Status_c2f</H3>
-<PRE>
-int MPI_Status_c2f(MPI_Status *, MPI_Fint *);
-</PRE>
-<DL><DD>
-Translates a C status object into a FORTRAN status object.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Status_f2c.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Status_f2c.html
deleted file mode 100644
index a1a6d65..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Status_f2c.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Status_f2c</title>
-<body>
-<H3>MPI_Status_f2c</H3>
-<PRE>
-int MPI_Status_f2c(MPI_Fint *, MPI_Status *);
-</PRE>
-<DL><DD>
-Converts a FORTRAN status object into a C status object.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Status_set_cancelled.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Status_set_cancelled.html
deleted file mode 100644
index aafefb0..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Status_set_cancelled.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Status_set_cancelled</title>
-<body>
-<H3>MPI_Status_set_cancelled</H3>
-<PRE>
-int MPI_Status_set_cancelled(MPI_Status *, int);
-</PRE>
-<DL><DD>
-Defines cancellation information for a request.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Status_set_elements.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Status_set_elements.html
deleted file mode 100644
index 92b70c4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Status_set_elements.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Status_set_elements</title>
-<body>
-<H3>MPI_Status_set_elements</H3>
-<PRE>
-int MPI_Status_set_elements(MPI_Status *, MPI_Datatype, int);
-</PRE>
-<DL><DD>
-Defines element information for a request.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Test.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Test.html
deleted file mode 100644
index 5da780f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Test.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Test</title>
-<body>
-<H3>MPI_Test</H3>
-<PRE>
-int MPI_Test(MPI_Request *, int *, MPI_Status *);
-</PRE>
-<DL><DD>
-Checks to see if a non-blocking operation has completed.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Test_cancelled.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Test_cancelled.html
deleted file mode 100644
index 056b402..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Test_cancelled.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Test_cancelled</title>
-<body>
-<H3>MPI_Test_cancelled</H3>
-<PRE>
-int MPI_Test_cancelled(MPI_Status *, int *);
-</PRE>
-<DL><DD>
-Tests whether a non-blocking operation was cancelled.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Testall.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Testall.html
deleted file mode 100644
index e354610..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Testall.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Testall</title>
-<body>
-<H3>MPI_Testall</H3>
-<PRE>
-int MPI_Testall(int, MPI_Request *, int *, MPI_Status *);
-</PRE>
-<DL><DD>
-Tests a collection of non-blocking operations for completion.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Testany.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Testany.html
deleted file mode 100644
index da8bd20..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Testany.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Testany</title>
-<body>
-<H3>MPI_Testany</H3>
-<PRE>
-int MPI_Testany(int, MPI_Request *, int *, int *, MPI_Status *);
-</PRE>
-<DL><DD>
-Tests for the completion of any specified non-blocking operation.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Testsome.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Testsome.html
deleted file mode 100644
index f1eff04..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Testsome.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Testsome</title>
-<body>
-<H3>MPI_Testsome</H3>
-<PRE>
-int MPI_Testsome(int, MPI_Request *, int *, int *, MPI_Status *);
-</PRE>
-<DL><DD>
-Tests a collection of non-blocking operations for completion.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Topo_test.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Topo_test.html
deleted file mode 100644
index eba67c6..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Topo_test.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Topo_test</title>
-<body>
-<H3>MPI_Topo_test</H3>
-<PRE>
-int MPI_Topo_test(MPI_Comm, int *);
-</PRE>
-<DL><DD>
-Returns the type of virtual topology associated with a communicator.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_c2f.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_c2f.html
deleted file mode 100644
index f1b57fd..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_c2f.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_c2f</title>
-<body>
-<H3>MPI_Type_c2f</H3>
-<PRE>
-MPI_Fint MPI_Type_c2f(MPI_Datatype);
-</PRE>
-<DL><DD>
-Translates a C datatype handle into a FORTRAN handle to the same datatype.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_commit.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_commit.html
deleted file mode 100644
index 9c606b1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_commit.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_commit</title>
-<body>
-<H3>MPI_Type_commit</H3>
-<PRE>
-int MPI_Type_commit(MPI_Datatype *);
-</PRE>
-<DL><DD>
-Makes a datatype ready for use in communication.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_contiguous.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_contiguous.html
deleted file mode 100644
index fd59ae7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_contiguous.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_contiguous</title>
-<body>
-<H3>MPI_Type_contiguous</H3>
-<PRE>
-int MPI_Type_contiguous(int, MPI_Datatype, MPI_Datatype *);
-</PRE>
-<DL><DD>
-Returns a new datatype that represents the concatenation of count instances ofoldtype.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_darray.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_darray.html
deleted file mode 100644
index 0a7cbcc..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_darray.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_create_darray</title>
-<body>
-<H3>MPI_Type_create_darray</H3>
-<PRE>
-int MPI_Type_create_darray(int, int, int, int [], int [], int [], int [], int,MPI_Datatype, MPI_Datatype *);
-</PRE>
-<DL><DD>
-Generates the datatypes corresponding to an HPF-like distribution of an ndims-dimensional array of oldtype elements onto anndims-dimensional grid of logical tasks.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_f90_complex.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_f90_complex.html
deleted file mode 100644
index 89efc36..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_f90_complex.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_create_f90_complex</title>
-<body>
-<H3>MPI_Type_create_f90_complex</H3>
-<PRE>
-int MPI_Type_create_f90_complex( int, int, MPI_Datatype * );
-</PRE>
-<DL><DD>
-Returns a predefined MPI datatype that matches a COMPLEX variable of KIND selected_real_kind(p, r).
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_f90_integer.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_f90_integer.html
deleted file mode 100644
index 4d4ff69..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_f90_integer.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_create_f90_integer</title>
-<body>
-<H3>MPI_Type_create_f90_integer</H3>
-<PRE>
-int MPI_Type_create_f90_integer( int, MPI_Datatype * );
-</PRE>
-<DL><DD>
-Returns a predefined MPI datatype that matches an INTEGER variable of KIND selected_integer_kind(r).
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_f90_real.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_f90_real.html
deleted file mode 100644
index fd7a8dc..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_f90_real.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_create_f90_real</title>
-<body>
-<H3>MPI_Type_create_f90_real</H3>
-<PRE>
-int MPI_Type_create_f90_real( int, int, MPI_Datatype * );
-</PRE>
-<DL><DD>
-Returns a predefined MPI datatype that matches a REAL variable of KIND selected_real_kind(p, r).
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_hindexed.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_hindexed.html
deleted file mode 100644
index b196aff..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_hindexed.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_create_hindexed</title>
-<body>
-<H3>MPI_Type_create_hindexed</H3>
-<PRE>
-int MPI_Type_create_hindexed(int, int [], MPI_Aint [], MPI_Datatype, MPI_Datatype *);
-</PRE>
-<DL><DD>
-Returns a new datatype that representscount blocks. Each block is defined by an entry in array_of_blocklengths andarray_of_displacements. Displacements are expressed in bytes.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_hvector.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_hvector.html
deleted file mode 100644
index 309a9bc..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_hvector.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_create_hvector</title>
-<body>
-<H3>MPI_Type_create_hvector</H3>
-<PRE>
-int MPI_Type_create_hvector(int, int, MPI_Aint, MPI_Datatype, MPI_Datatype *);
-</PRE>
-<DL><DD>
-Returns a new datatype that represents equally-spaced blocks. The spacing between the start of each block is given in bytes.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_indexed_block.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_indexed_block.html
deleted file mode 100644
index 608257f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_indexed_block.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_create_indexed_block</title>
-<body>
-<H3>MPI_Type_create_indexed_block</H3>
-<PRE>
-int MPI_Type_create_indexed_block(int, int, int [], MPI_Datatype, MPI_Datatype *);
-</PRE>
-<DL><DD>
-Returns a new datatype that representscount blocks.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_keyval.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_keyval.html
deleted file mode 100644
index 20dc621..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_keyval.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_create_keyval</title>
-<body>
-<H3>MPI_Type_create_keyval</H3>
-<PRE>
-int MPI_Type_create_keyval(MPI_Type_copy_attr_function *, MPI_Type_delete_attr_function *, int *, void *);
-</PRE>
-<DL><DD>
-Generates a new attribute key for a datatype.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_resized.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_resized.html
deleted file mode 100644
index 1ee8a3a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_resized.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_create_resized</title>
-<body>
-<H3>MPI_Type_create_resized</H3>
-<PRE>
-int MPI_Type_create_resized(MPI_Datatype, MPI_Aint, MPI_Aint, MPI_Datatype *);
-</PRE>
-<DL><DD>
-Duplicates a datatype and changes the upper bound, lower bound, and extent.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_struct.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_struct.html
deleted file mode 100644
index adf21df..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_struct.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_create_struct</title>
-<body>
-<H3>MPI_Type_create_struct</H3>
-<PRE>
-int MPI_Type_create_struct(int, int [], MPI_Aint [], MPI_Datatype [], MPI_Datatype *);
-</PRE>
-<DL><DD>
-Returns a new datatype that representscount blocks. Each block is defined by an entry in array_of_blocklengths,array_of_displacements, and array_of_types. Displacements are expressed in bytes.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_subarray.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_subarray.html
deleted file mode 100644
index da75ad7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_create_subarray.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_create_subarray</title>
-<body>
-<H3>MPI_Type_create_subarray</H3>
-<PRE>
-int MPI_Type_create_subarray(int, int [], int [], int [], int, MPI_Datatype, MPI_Datatype *);
-</PRE>
-<DL><DD>
-Returns a new datatype that represents anndims-dimensional subarray of anndims-dimensional array.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_delete_attr.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_delete_attr.html
deleted file mode 100644
index ad3d312..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_delete_attr.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_delete_attr</title>
-<body>
-<H3>MPI_Type_delete_attr</H3>
-<PRE>
-int MPI_Type_delete_attr(MPI_Datatype, int);
-</PRE>
-<DL><DD>
-Deletes an attribute from a datatype.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_dup.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_dup.html
deleted file mode 100644
index 2b74726..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_dup.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_dup</title>
-<body>
-<H3>MPI_Type_dup</H3>
-<PRE>
-int MPI_Type_dup(MPI_Datatype, MPI_Datatype *);
-</PRE>
-<DL><DD>
-Duplicates the existing type with associated key values.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_extent.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_extent.html
deleted file mode 100644
index 270c3bb..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_extent.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_extent</title>
-<body>
-<H3>MPI_Type_extent</H3>
-<PRE>
-int MPI_Type_extent(MPI_Datatype, MPI_Aint *);
-</PRE>
-<DL><DD>
-Returns the extent of any defined datatype.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_f2c.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_f2c.html
deleted file mode 100644
index 37e830b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_f2c.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_f2c</title>
-<body>
-<H3>MPI_Type_f2c</H3>
-<PRE>
-MPI_Datatype MPI_Type_f2c(MPI_Fint);
-</PRE>
-<DL><DD>
-Returns a C handle to a datatype.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_free.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_free.html
deleted file mode 100644
index a900b6b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_free.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_free</title>
-<body>
-<H3>MPI_Type_free</H3>
-<PRE>
-int MPI_Type_free(MPI_Datatype *);
-</PRE>
-<DL><DD>
-Marks a derived datatype for deallocation and sets its handle to MPI_DATATYPE_NULL.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_free_keyval.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_free_keyval.html
deleted file mode 100644
index ee7fce1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_free_keyval.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_free_keyval</title>
-<body>
-<H3>MPI_Type_free_keyval</H3>
-<PRE>
-int MPI_Type_free_keyval(int *);
-</PRE>
-<DL><DD>
-Frees a datatype key value.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_attr.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_attr.html
deleted file mode 100644
index 9e89d56..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_attr.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_get_attr</title>
-<body>
-<H3>MPI_Type_get_attr</H3>
-<PRE>
-int MPI_Type_get_attr(MPI_Datatype, int, void *, int *);
-</PRE>
-<DL><DD>
-Attaches an attribute to a datatype.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_contents.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_contents.html
deleted file mode 100644
index e75ba67..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_contents.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_get_contents</title>
-<body>
-<H3>MPI_Type_get_contents</H3>
-<PRE>
-int MPI_Type_get_contents(MPI_Datatype, int, int, int, int [], MPI_Aint [], MPI_Datatype []);
-</PRE>
-<DL><DD>
-Obtains the arguments used in the creation of the datatype.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_envelope.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_envelope.html
deleted file mode 100644
index cb3c1f3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_envelope.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_get_envelope</title>
-<body>
-<H3>MPI_Type_get_envelope</H3>
-<PRE>
-int MPI_Type_get_envelope(MPI_Datatype, int *, int *, int *, int *);
-</PRE>
-<DL><DD>
-Determines the constructor that was used to create the datatype.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_extent.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_extent.html
deleted file mode 100644
index ad7bbd7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_extent.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_get_extent</title>
-<body>
-<H3>MPI_Type_get_extent</H3>
-<PRE>
-int MPI_Type_get_extent(MPI_Datatype, MPI_Aint *, MPI_Aint *);
-</PRE>
-<DL><DD>
-Returns the lower bound and the extent of any defined datatype.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_name.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_name.html
deleted file mode 100644
index ad6b560..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_name.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_get_name</title>
-<body>
-<H3>MPI_Type_get_name</H3>
-<PRE>
-int MPI_Type_get_name(MPI_Datatype, char *, int *);
-</PRE>
-<DL><DD>
-Returns the name that was last associated with a datatype.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_true_extent.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_true_extent.html
deleted file mode 100644
index 016abc9..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_get_true_extent.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_get_true_extent</title>
-<body>
-<H3>MPI_Type_get_true_extent</H3>
-<PRE>
-int MPI_Type_get_true_extent(MPI_Datatype, MPI_Aint *, MPI_Aint *);
-</PRE>
-<DL><DD>
-Returns the true extent of any defined datatype.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_hindexed.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_hindexed.html
deleted file mode 100644
index 57e3df1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_hindexed.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_hindexed</title>
-<body>
-<H3>MPI_Type_hindexed</H3>
-<PRE>
-int MPI_Type_hindexed(int, int *, MPI_Aint *, MPI_Datatype, MPI_Datatype *);
-</PRE>
-<DL><DD>
-Returns a new datatype that representscount distinct blocks with offsets expressed in bytes.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_hvector.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_hvector.html
deleted file mode 100644
index 705ecaf..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_hvector.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_hvector</title>
-<body>
-<H3>MPI_Type_hvector</H3>
-<PRE>
-int MPI_Type_hvector(int, int, MPI_Aint, MPI_Datatype, MPI_Datatype *);
-</PRE>
-<DL><DD>
-Returns a new datatype of count blocks with stride expressed in bytes.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_indexed.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_indexed.html
deleted file mode 100644
index cd5df90..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_indexed.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_indexed</title>
-<body>
-<H3>MPI_Type_indexed</H3>
-<PRE>
-int MPI_Type_indexed(int, int *, int *, MPI_Datatype, MPI_Datatype *);
-</PRE>
-<DL><DD>
-Returns a new datatype that representscount blocks with stride in terms of defining type.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_lb.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_lb.html
deleted file mode 100644
index 9ffb82f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_lb.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_lb</title>
-<body>
-<H3>MPI_Type_lb</H3>
-<PRE>
-int MPI_Type_lb(MPI_Datatype, MPI_Aint *);
-</PRE>
-<DL><DD>
-Returns the lower bound of a datatype.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_match_size.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_match_size.html
deleted file mode 100644
index 69120ae..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_match_size.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_match_size</title>
-<body>
-<H3>MPI_Type_match_size</H3>
-<PRE>
-int MPI_Type_match_size( int, int, MPI_Datatype *);
-</PRE>
-<DL><DD>
-Returns a reference (handle) to one of the predefined named datatypes, not a duplicate.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_set_attr.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_set_attr.html
deleted file mode 100644
index 57e6fe7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_set_attr.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_set_attr</title>
-<body>
-<H3>MPI_Type_set_attr</H3>
-<PRE>
-int MPI_Type_set_attr(MPI_Datatype, int, void *);
-</PRE>
-<DL><DD>
-Attaches the datatype attribute value to the datatype and associates it with the key.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_set_name.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_set_name.html
deleted file mode 100644
index 306f25a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_set_name.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_set_name</title>
-<body>
-<H3>MPI_Type_set_name</H3>
-<PRE>
-int MPI_Type_set_name(MPI_Datatype, char *);
-</PRE>
-<DL><DD>
-Associates a name string with a datatype.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_size.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_size.html
deleted file mode 100644
index f434aff..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_size.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_size</title>
-<body>
-<H3>MPI_Type_size</H3>
-<PRE>
-int MPI_Type_size(MPI_Datatype, int *);
-</PRE>
-<DL><DD>
-Returns the number of bytes represented by any defined datatype.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_struct.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_struct.html
deleted file mode 100644
index 6cf0b0e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_struct.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_struct</title>
-<body>
-<H3>MPI_Type_struct</H3>
-<PRE>
-int MPI_Type_struct(int, int *, MPI_Aint *, MPI_Datatype *, MPI_Datatype *);
-</PRE>
-<DL><DD>
-Returns a new datatype that representscount blocks, each with a distinct format and offset.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_ub.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_ub.html
deleted file mode 100644
index 16d7a3a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_ub.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_ub</title>
-<body>
-<H3>MPI_Type_ub</H3>
-<PRE>
-int MPI_Type_ub(MPI_Datatype, MPI_Aint *);
-</PRE>
-<DL><DD>
-Returns the upper bound of a datatype.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_vector.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_vector.html
deleted file mode 100644
index 50a0759..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Type_vector.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Type_vector</title>
-<body>
-<H3>MPI_Type_vector</H3>
-<PRE>
-int MPI_Type_vector(int, int, int, MPI_Datatype, MPI_Datatype *);
-</PRE>
-<DL><DD>
-Returns a new datatype that represents equally-spaced blocks of replicated data.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Unpack.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Unpack.html
deleted file mode 100644
index 6fdfce1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Unpack.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Unpack</title>
-<body>
-<H3>MPI_Unpack</H3>
-<PRE>
-int MPI_Unpack(void*, int, int *, void *, int, MPI_Datatype, MPI_Comm);
-</PRE>
-<DL><DD>
-Unpacks the message into the specified receive buffer from the specified packed buffer.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Unpack_external.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Unpack_external.html
deleted file mode 100644
index d58ad48..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Unpack_external.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Unpack_external</title>
-<body>
-<H3>MPI_Unpack_external</H3>
-<PRE>
-int MPI_Unpack_external(char *, void *, MPI_Aint, MPI_Aint *, void *, int, MPI_Datatype);int MPI_Win_create_errhandler(MPI_Win_errhandler_fn *, MPI_Errhandler *);
-</PRE>
-<DL><DD>
-Unpacks the message into the specified receive buffer from the specified packed buffer, using the external32 data format.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Wait.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Wait.html
deleted file mode 100644
index 3c72e93..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Wait.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Wait</title>
-<body>
-<H3>MPI_Wait</H3>
-<PRE>
-int MPI_Wait(MPI_Request *, MPI_Status *);
-</PRE>
-<DL><DD>
-Waits for a non-blocking operation to complete.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Waitall.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Waitall.html
deleted file mode 100644
index 208f475..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Waitall.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Waitall</title>
-<body>
-<H3>MPI_Waitall</H3>
-<PRE>
-int MPI_Waitall(int, MPI_Request *, MPI_Status *);
-</PRE>
-<DL><DD>
-Waits for a collection of non-blocking operations to complete.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Waitany.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Waitany.html
deleted file mode 100644
index f0b160a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Waitany.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Waitany</title>
-<body>
-<H3>MPI_Waitany</H3>
-<PRE>
-int MPI_Waitany(int, MPI_Request *, int *, MPI_Status *);
-</PRE>
-<DL><DD>
-Waits for any specified non-blocking operation to complete.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Waitsome.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Waitsome.html
deleted file mode 100644
index 96f7fbb..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Waitsome.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Waitsome</title>
-<body>
-<H3>MPI_Waitsome</H3>
-<PRE>
-int MPI_Waitsome(int, MPI_Request *, int *, int *, MPI_Status *);
-</PRE>
-<DL><DD>
-Waits for at least one of a list of non-blocking operations to complete.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_c2f.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_c2f.html
deleted file mode 100644
index fdbef09..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_c2f.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_c2f</title>
-<body>
-<H3>MPI_Win_c2f</H3>
-<PRE>
-MPI_Fint MPI_Win_c2f(MPI_Win);
-</PRE>
-<DL><DD>
-Translates a C window handle into a FORTRAN handle to the same window.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_call_errhandler.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_call_errhandler.html
deleted file mode 100644
index 428e9b9..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_call_errhandler.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_call_errhandler</title>
-<body>
-<H3>MPI_Win_call_errhandler</H3>
-<PRE>
-int MPI_Win_call_errhandler(MPI_Win, int);
-</PRE>
-<DL><DD>
-Calls the error handler assigned to the window with the error code supplied.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_complete.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_complete.html
deleted file mode 100644
index 57d225d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_complete.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_complete</title>
-<body>
-<H3>MPI_Win_complete</H3>
-<PRE>
-int MPI_Win_complete(MPI_Win);
-</PRE>
-<DL><DD>
-Completes an RMA access epoch on a window object.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_create.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_create.html
deleted file mode 100644
index a47ac7f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_create.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_create</title>
-<body>
-<H3>MPI_Win_create</H3>
-<PRE>
-int MPI_Win_create(void *, MPI_Aint, int, MPI_Info, MPI_Comm, MPI_Win *);
-</PRE>
-<DL><DD>
-Allows each task in an intra-communicator group to specify a "window" in its memory that is made accessible to accesses by remote tasks.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_create_errhandler.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_create_errhandler.html
deleted file mode 100644
index 5d907b7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_create_errhandler.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_create_errhandler</title>
-<body>
-<H3>MPI_Win_create_errhandler</H3>
-<PRE>
-int MPI_Win_create_errhandler(MPI_Win_errhandler_fn *, MPI_Errhandler *);
-</PRE>
-<DL><DD>
-Creates an error handler that can be attached to windows.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_create_keyval.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_create_keyval.html
deleted file mode 100644
index b4f056b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_create_keyval.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_create_keyval</title>
-<body>
-<H3>MPI_Win_create_keyval</H3>
-<PRE>
-int MPI_Win_create_keyval(MPI_Win_copy_attr_function *, MPI_Win_delete_attr_function *, int *, void *);
-</PRE>
-<DL><DD>
-Generates a new window attribute key.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_delete_attr.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_delete_attr.html
deleted file mode 100644
index 4d8d1e9..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_delete_attr.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_delete_attr</title>
-<body>
-<H3>MPI_Win_delete_attr</H3>
-<PRE>
-int MPI_Win_delete_attr(MPI_Win, int);
-</PRE>
-<DL><DD>
-Deletes an attribute from a window.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_f2c.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_f2c.html
deleted file mode 100644
index e396dce..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_f2c.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_f2c</title>
-<body>
-<H3>MPI_Win_f2c</H3>
-<PRE>
-MPI_Win MPI_Win_f2c(MPI_Fint);
-</PRE>
-<DL><DD>
-Returns a C handle to a window.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_fence.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_fence.html
deleted file mode 100644
index 645864a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_fence.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_fence</title>
-<body>
-<H3>MPI_Win_fence</H3>
-<PRE>
-int MPI_Win_fence(int, MPI_Win);
-</PRE>
-<DL><DD>
-Synchronizes RMA calls on a window.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_free.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_free.html
deleted file mode 100644
index 58794e2..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_free.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_free</title>
-<body>
-<H3>MPI_Win_free</H3>
-<PRE>
-int MPI_Win_free(MPI_Win *);
-</PRE>
-<DL><DD>
-Frees the window object and returns a null handle (equal to MPI_WIN_NULL).
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_free_keyval.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_free_keyval.html
deleted file mode 100644
index a2f3d3e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_free_keyval.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_free_keyval</title>
-<body>
-<H3>MPI_Win_free_keyval</H3>
-<PRE>
-int MPI_Win_free_keyval(int *);
-</PRE>
-<DL><DD>
-Marks a window attribute key for deallocation.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_attr.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_attr.html
deleted file mode 100644
index c67bcdc..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_attr.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_get_attr</title>
-<body>
-<H3>MPI_Win_get_attr</H3>
-<PRE>
-int MPI_Win_get_attr(MPI_Win, int, void *, int *);
-</PRE>
-<DL><DD>
-Retrieves the window attribute value identified by the key.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_errhandler.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_errhandler.html
deleted file mode 100644
index 184d1bb..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_errhandler.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_get_errhandler</title>
-<body>
-<H3>MPI_Win_get_errhandler</H3>
-<PRE>
-int MPI_Win_get_errhandler(MPI_Win, MPI_Errhandler *);
-</PRE>
-<DL><DD>
-Retrieves the error handler currently associated with a window.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_group.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_group.html
deleted file mode 100644
index cd7d92c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_group.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_get_group</title>
-<body>
-<H3>MPI_Win_get_group</H3>
-<PRE>
-int MPI_Win_get_group(MPI_Win, MPI_Group *);
-</PRE>
-<DL><DD>
-Returns a duplicate of the group of the communicator used to create a window.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_name.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_name.html
deleted file mode 100644
index 529cb6f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_get_name.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_get_name</title>
-<body>
-<H3>MPI_Win_get_name</H3>
-<PRE>
-int MPI_Win_get_name(MPI_Win, char *, int *);
-</PRE>
-<DL><DD>
-Returns the name that was last associated with a window.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_lock.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_lock.html
deleted file mode 100644
index 3e2dad6..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_lock.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_lock</title>
-<body>
-<H3>MPI_Win_lock</H3>
-<PRE>
-int MPI_Win_lock(int, int, int, MPI_Win);
-</PRE>
-<DL><DD>
-Starts an RMA access epoch at the target task.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_post.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_post.html
deleted file mode 100644
index 3b770ab..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_post.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_post</title>
-<body>
-<H3>MPI_Win_post</H3>
-<PRE>
-int MPI_Win_post(MPI_Group, int, MPI_Win);
-</PRE>
-<DL><DD>
-Starts an RMA exposure epoch for a local window.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_set_attr.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_set_attr.html
deleted file mode 100644
index 0d59083..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_set_attr.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_set_attr</title>
-<body>
-<H3>MPI_Win_set_attr</H3>
-<PRE>
-int MPI_Win_set_attr(MPI_Win, int, void *);
-</PRE>
-<DL><DD>
-Attaches the window attribute value to the window and associates it with the key.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_set_errhandler.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_set_errhandler.html
deleted file mode 100644
index 83aa106..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_set_errhandler.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_set_errhandler</title>
-<body>
-<H3>MPI_Win_set_errhandler</H3>
-<PRE>
-int MPI_Win_set_errhandler(MPI_Win, MPI_Errhandler);
-</PRE>
-<DL><DD>
-Attaches a new error handler to a window.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_set_name.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_set_name.html
deleted file mode 100644
index a5e6f41..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_set_name.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_set_name</title>
-<body>
-<H3>MPI_Win_set_name</H3>
-<PRE>
-int MPI_Win_set_name(MPI_Win, char *);
-</PRE>
-<DL><DD>
-Associates a name string with a window.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_start.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_start.html
deleted file mode 100644
index ae31b05..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_start.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_start</title>
-<body>
-<H3>MPI_Win_start</H3>
-<PRE>
-int MPI_Win_start(MPI_Group, int, MPI_Win);
-</PRE>
-<DL><DD>
-Starts an RMA access epoch for a window object.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_test.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_test.html
deleted file mode 100644
index 0d2921d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_test.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_test</title>
-<body>
-<H3>MPI_Win_test</H3>
-<PRE>
-int MPI_Win_test(MPI_Win, int *);
-</PRE>
-<DL><DD>
-Tries to complete an RMA exposure epoch.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_unlock.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_unlock.html
deleted file mode 100644
index 5dc4e45..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_unlock.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_unlock</title>
-<body>
-<H3>MPI_Win_unlock</H3>
-<PRE>
-int MPI_Win_unlock(int, MPI_Win);
-</PRE>
-<DL><DD>
-Completes an RMA access epoch at the target task.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_wait.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_wait.html
deleted file mode 100644
index 6816c8c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Win_wait.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Win_wait</title>
-<body>
-<H3>MPI_Win_wait</H3>
-<PRE>
-int MPI_Win_wait(MPI_Win);
-</PRE>
-<DL><DD>
-Completes an RMA exposure epoch.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Wtick.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Wtick.html
deleted file mode 100644
index d4c0e0d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Wtick.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Wtick</title>
-<body>
-<H3>MPI_Wtick</H3>
-<PRE>
-double MPI_Wtick(void);
-</PRE>
-<DL><DD>
-Returns the resolution of MPI_WTIME in seconds.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Wtime.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Wtime.html
deleted file mode 100644
index c530a20..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/html/MPI_Wtime.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>MPI_Wtime</title>
-<body>
-<H3>MPI_Wtime</H3>
-<PRE>
-double MPI_Wtime(void);
-</PRE>
-<DL><DD>
-Returns the current value of time as a floating-point value.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/icons/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/icons/.cvsignore
deleted file mode 100644
index 32f2eb8..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/icons/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-pspbrwse.jbf

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/icons/mpi.gif b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/icons/mpi.gif
deleted file mode 100644
index 1a2b28a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/icons/mpi.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/mpiref.xml b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/mpiref.xml
deleted file mode 100644
index 2fee68c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/mpiref.xml
+++ /dev/null

@@ -1,3097 +0,0 @@
-<?xml version="1.0"?>
-<allFunctions>
-<function>
-<cname>MPI_Abort</cname>
-<cppname>MPI::Comm::Abort</cppname>
-<fname>MPI_ABORT</fname>
-<namespace></namespace>
-<description>Forces all tasks of an MPI job to terminate.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Abort</name>
-<arguments>MPI_Comm, int</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Accumulate</cname>
-<cppname>MPI::Win::Accumulate</cppname>
-<fname>MPI_ACCUMULATE</fname>
-<namespace></namespace>
-<description>Accumulates, according to the specified reduction operation, the contents of the origin buffer to the specified target buffer.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Accumulate</name>
-<arguments>void *, int, MPI_Datatype, int, MPI_Aint, int, MPI_Datatype,  MPI_Op, MPI_Win</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Add_error_class</cname>
-<cppname>MPI::Add_error_class</cppname>
-<fname>MPI_ADD_ERROR_CLASS</fname>
-<namespace></namespace>
-<description>Creates a new error class and returns the value for it.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Add_error_class</name>
-<arguments>int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Add_error_code</cname>
-<cppname>MPI::Add_error_code</cppname>
-<fname>MPI_ADD_ERROR_CODE</fname>
-<namespace></namespace>
-<description>Creates a new error code and returns the value for it.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Add_error_code</name>
-<arguments>int, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Add_error_string</cname>
-<cppname>MPI::Add_error_string</cppname>
-<fname>MPI_ADD_ERROR_STRING</fname>
-<namespace></namespace>
-<description>Associates an error string with an error code or class.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Add_error_string</name>
-<arguments>int, char *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Address</cname>
-<cppname>(none)</cppname>
-<fname>MPI_ADDRESS</fname>
-<namespace></namespace>
-<description>Returns the address of a location in memory.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Address</name>
-<arguments>void*, MPI_Aint *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Allgather</cname>
-<cppname>MPI::Comm::Allgather</cppname>
-<fname>MPI_ALLGATHER</fname>
-<namespace></namespace>
-<description>Collects messages from each task and distributes the resulting message to each.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Allgather</name>
-<arguments>void* , int, MPI_Datatype, void*, int, MPI_Datatype, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Allgatherv</cname>
-<cppname>MPI::Comm::Allgatherv</cppname>
-<fname>MPI_ALLGATHERV</fname>
-<namespace></namespace>
-<description>Collects messages from each task and distributes the resulting message to all tasks. Messages can have variable sizes and displacements.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Allgatherv</name>
-<arguments>void* , int, MPI_Datatype, void*, int *, int *, MPI_Datatype, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Alloc_mem</cname>
-<cppname>MPI::Alloc_mem</cppname>
-<fname>MPI_ALLOC_MEM</fname>
-<namespace></namespace>
-<description>Allocates storage and returns a pointer to it.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Alloc_mem</name>
-<arguments>MPI_Aint, MPI_Info info, void *baseptr</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Allreduce</cname>
-<cppname>MPI::Comm::Allreduce</cppname>
-<fname>MPI_ALLREDUCE</fname>
-<namespace></namespace>
-<description>Applies a reduction operation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Allreduce</name>
-<arguments>void* , void*, int, MPI_Datatype, MPI_Op, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Alltoall</cname>
-<cppname>MPI::Comm::Alltoall</cppname>
-<fname>MPI_ALLTOALL</fname>
-<namespace></namespace>
-<description>Sends a distinct message from each task to every task.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Alltoall</name>
-<arguments>void* , int, MPI_Datatype, void*, int, MPI_Datatype, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Alltoallv</cname>
-<cppname>MPI::Comm::Alltoallv</cppname>
-<fname>MPI_ALLTOALLV</fname>
-<namespace></namespace>
-<description>Sends a distinct message from each task to every task. Messages can have different sizes and displacements.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Alltoallv</name>
-<arguments>void* , int *, int *, MPI_Datatype, void*, int *, int *, MPI_Datatype, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Alltoallw</cname>
-<cppname>MPI::Comm::Alltoallw</cppname>
-<fname>MPI_ALLTOALLW</fname>
-<namespace></namespace>
-<description>Sends a distinct message from each task to every task. Messages can have different datatypes, sizes, and displacements.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Alltoallw</name>
-<arguments>void *, int [], int [], MPI_Datatype [], void *, int [], int [], MPI_Datatype [], MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Attr_delete</cname>
-<cppname>(none)</cppname>
-<fname>MPI_ATTR_DELETE</fname>
-<namespace></namespace>
-<description>Removes an attribute value from a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Attr_delete</name>
-<arguments>MPI_Comm, int</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Attr_get</cname>
-<cppname>(none)</cppname>
-<fname>MPI_ATTR_GET</fname>
-<namespace></namespace>
-<description>Retrieves an attribute value from a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Attr_get</name>
-<arguments>MPI_Comm, int, void *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Attr_put</cname>
-<cppname>(none)</cppname>
-<fname>MPI_ATTR_PUT</fname>
-<namespace></namespace>
-<description>Associates an attribute value with a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Attr_put</name>
-<arguments>MPI_Comm, int, void*</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Barrier</cname>
-<cppname>MPI::Comm::Barrier</cppname>
-<fname>MPI_BARRIER</fname>
-<namespace></namespace>
-<description>Blocks each task until all tasks have called it.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Barrier</name>
-<arguments>MPI_Comm </arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Bcast</cname>
-<cppname>MPI::Comm::Bcast</cppname>
-<fname>MPI_BCAST</fname>
-<namespace></namespace>
-<description>Broadcasts a message from root to all tasks in the group.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Bcast</name>
-<arguments>void*, int, MPI_Datatype, int, MPI_Comm </arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Bsend</cname>
-<cppname>MPI::Comm::Bsend</cppname>
-<fname>MPI_BSEND</fname>
-<namespace></namespace>
-<description>Performs a blocking buffered mode send operation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Bsend</name>
-<arguments>void*, int, MPI_Datatype, int, int, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Bsend_init</cname>
-<cppname>MPI::Comm::Bsend_init</cppname>
-<fname>MPI_BSEND_INIT</fname>
-<namespace></namespace>
-<description>Creates a persistent buffered mode send request.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Bsend_init</name>
-<arguments>void*, int, MPI_Datatype, int,int, MPI_Comm, MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Buffer_attach</cname>
-<cppname>MPI::Attach_buffer</cppname>
-<fname>MPI_BUFFER_ATTACH</fname>
-<namespace></namespace>
-<description>Provides MPI with a message buffer for sending.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Buffer_attach</name>
-<arguments> void*, int</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Buffer_detach</cname>
-<cppname>MPI::Detach_buffer</cppname>
-<fname>MPI_BUFFER_DETACH</fname>
-<namespace></namespace>
-<description>Detaches the current buffer.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Buffer_detach</name>
-<arguments> void*, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Cancel</cname>
-<cppname>MPI::Request::Cancel</cppname>
-<fname>MPI_CANCEL</fname>
-<namespace></namespace>
-<description>Marks a non-blocking operation for cancellation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Cancel</name>
-<arguments>MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Cart_coords</cname>
-<cppname>MPI::Cartcomm::Get_coords</cppname>
-<fname>MPI_CART_COORDS</fname>
-<namespace></namespace>
-<description>Translates task rank in a communicator into Cartesian task coordinates.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Cart_coords</name>
-<arguments>MPI_Comm, int, int, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Cart_create</cname>
-<cppname>MPI::Intracomm::Create_cart</cppname>
-<fname>MPI_CART_CREATE</fname>
-<namespace></namespace>
-<description>Creates a communicator containing topology information.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Cart_create</name>
-<arguments>MPI_Comm, int, int *, int *, int, MPI_Comm *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Cart_get</cname>
-<cppname>MPI::Cartcomm::Get_topo</cppname>
-<fname>MPI_CART_GET</fname>
-<namespace></namespace>
-<description>Retrieves Cartesian topology information from a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Cart_get</name>
-<arguments>MPI_Comm, int, int *, int *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Cart_map</cname>
-<cppname>MPI::Cartcomm::Map</cppname>
-<fname>MPI_CART_MAP</fname>
-<namespace></namespace>
-<description>Computes placement of tasks on the physical processor.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Cart_map</name>
-<arguments>MPI_Comm, int, int *, int *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Cart_rank</cname>
-<cppname>MPI::Cartcomm::Get_cart_rank</cppname>
-<fname>MPI_CART_RANK</fname>
-<namespace></namespace>
-<description>Translates task coordinates into a task rank.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Cart_rank</name>
-<arguments>MPI_Comm, int *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Cart_shift</cname>
-<cppname>MPI::Cartcomm::Shift</cppname>
-<fname>MPI_CART_SHIFT</fname>
-<namespace></namespace>
-<description>Returns shifted source and destination ranks for a task.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Cart_shift</name>
-<arguments>MPI_Comm, int, int, int *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Cart_sub</cname>
-<cppname>MPI::Cartcomm::Sub</cppname>
-<fname>MPI_CART_SUB</fname>
-<namespace></namespace>
-<description>Partitions a Cartesian communicator into lower-dimensional subgroups.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Cart_sub</name>
-<arguments>MPI_Comm, int *, MPI_Comm *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Cartdim_get</cname>
-<cppname>MPI::Cartcomm::Get_dim</cppname>
-<fname>MPI_CARTDIM_GET</fname>
-<namespace></namespace>
-<description>Retrieves the number of Cartesian dimensions from a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Cartdim_get</name>
-<arguments>MPI_Comm, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_c2f</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Translates a C communicator handle into a FORTRAN handle to the same communicator.</description>
-<prototype>
-<returnType>MPI_Fint</returnType>
-<name>MPI_Comm_c2f</name>
-<arguments>MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_call_errhandler</cname>
-<cppname>MPI::Comm::Call_errhandler</cppname>
-<fname>MPI_COMM_CALL_ERRHANDLER</fname>
-<namespace></namespace>
-<description>Calls the error handler assigned to the communicator with the error code supplied.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_call_errhandler</name>
-<arguments>MPI_Comm, int</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_compare</cname>
-<cppname>MPI::Comm::Compare</cppname>
-<fname>MPI_COMM_COMPARE</fname>
-<namespace></namespace>
-<description>Compares the groups and contexts of two communicators.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_compare</name>
-<arguments>MPI_Comm, MPI_Comm, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_create</cname>
-<cppname>MPI::Intercomm::Create,</cppname>
-<fname>MPI::Intracomm::Create</fname>
-<namespace></namespace>
-<description>Creates a new communicator with a given group.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_create</name>
-<arguments>MPI_Comm, MPI_Group, MPI_Comm *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_create_errhandler</cname>
-<cppname>MPI::Comm::Create_errhandler</cppname>
-<fname>MPI_COMM_CREATE_ERRHANDLER</fname>
-<namespace></namespace>
-<description>Creates an error handler that can be attached to communicators.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_create_errhandler</name>
-<arguments>MPI_Comm_errhandler_fn *, MPI_Errhandler *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_create_keyval</cname>
-<cppname>MPI::Comm::Create_keyval</cppname>
-<fname>MPI_COMM_CREATE_KEYVAL</fname>
-<namespace></namespace>
-<description>Generates a new communicator attribute key.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_create_keyval</name>
-<arguments>MPI_Comm_copy_attr_function *, MPI_Comm_delete_attr_function *, int *, void *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_delete_attr</cname>
-<cppname>MPI::Comm::Delete_attr</cppname>
-<fname>MPI_COMM_DELETE_ATTR</fname>
-<namespace></namespace>
-<description>Removes an attribute value from a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_delete_attr</name>
-<arguments>MPI_Comm, int</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_dup</cname>
-<cppname>MPI::Cartcomm::Dup,</cppname>
-<fname>MPI::Graphcomm::Dup,</fname>
-<namespace></namespace>
-<description>Creates a new communicator that is a duplicate of an existing communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_dup</name>
-<arguments>MPI_Comm, MPI_Comm *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_f2c</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Returns a C handle to a communicator.</description>
-<prototype>
-<returnType>MPI_Comm</returnType>
-<name>MPI_Comm_f2c</name>
-<arguments>MPI_Fint</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_free</cname>
-<cppname>MPI::Comm::Free</cppname>
-<fname>MPI_COMM_FREE</fname>
-<namespace></namespace>
-<description>Marks a communicator for deallocation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_free</name>
-<arguments>MPI_Comm *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_free_keyval</cname>
-<cppname>MPI::Comm::Free_keyval</cppname>
-<fname>MPI_COMM_FREE_KEYVAL</fname>
-<namespace></namespace>
-<description>Marks a communicator attribute key for deallocation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_free_keyval</name>
-<arguments>int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_get_attr</cname>
-<cppname>MPI::Comm::Get_attr</cppname>
-<fname>MPI_COMM_GET_ATTR</fname>
-<namespace></namespace>
-<description>Retrieves the communicator attribute value identified by the key.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_get_attr</name>
-<arguments>MPI_Comm, int, void *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_get_errhandler</cname>
-<cppname>MPI::Comm::Get_errhandler</cppname>
-<fname>MPI_COMM_GET_ERRHANDLER</fname>
-<namespace></namespace>
-<description>Retrieves the error handler currently associated with a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_get_errhandler</name>
-<arguments>MPI_Comm, MPI_Errhandler *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_get_name</cname>
-<cppname>MPI::Comm::Get_name</cppname>
-<fname>MPI_COMM_GET_NAME</fname>
-<namespace></namespace>
-<description>Returns the name that was last associated with a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_get_name</name>
-<arguments>MPI_Comm, char *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_group</cname>
-<cppname>MPI::Comm::Get_group</cppname>
-<fname>MPI_COMM_GROUP</fname>
-<namespace></namespace>
-<description>Returns the group handle associated with a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_group</name>
-<arguments>MPI_Comm, MPI_Group *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_rank</cname>
-<cppname>MPI::Comm::Get_rank</cppname>
-<fname>MPI_COMM_RANK</fname>
-<namespace></namespace>
-<description>Returns the rank of the local task in the group associated with a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_rank</name>
-<arguments>MPI_Comm, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_remote_group</cname>
-<cppname>MPI::Intercomm::Get_remote_group</cppname>
-<fname>MPI_COMM_REMOTE_GROUP</fname>
-<namespace></namespace>
-<description>Returns the handle of the remote group of an inter-communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_remote_group</name>
-<arguments>MPI_Comm, MPI_Group *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_remote_size</cname>
-<cppname>MPI::Intercomm::Get_remote_size</cppname>
-<fname>MPI_COMM_REMOTE_SIZE</fname>
-<namespace></namespace>
-<description>Returns the size of the remote group of an inter-communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_remote_size</name>
-<arguments>MPI_Comm, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_set_attr</cname>
-<cppname>MPI::Comm::Set_attr</cppname>
-<fname>MPI_COMM_SET_ATTR</fname>
-<namespace></namespace>
-<description>Attaches the communicator attribute value to the communicator and associates it with the key.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_set_attr</name>
-<arguments>MPI_Comm, int, void *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_set_errhandler</cname>
-<cppname>MPI::Comm::Set_errhandler</cppname>
-<fname>MPI_COMM_SET_ERRHANDLER</fname>
-<namespace></namespace>
-<description>Attaches a new error handler to a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_set_errhandler</name>
-<arguments>MPI_Comm, MPI_Errhandler</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_set_name</cname>
-<cppname>MPI::Comm::Set_name</cppname>
-<fname>MPI_COMM_SET_NAME</fname>
-<namespace></namespace>
-<description>Associates a name string with a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_set_name</name>
-<arguments>MPI_Comm, char *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_size</cname>
-<cppname>MPI::Comm::Get_size</cppname>
-<fname>MPI_COMM_SIZE</fname>
-<namespace></namespace>
-<description>Returns the size of the group associated with a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_size</name>
-<arguments>MPI_Comm, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_split</cname>
-<cppname>MPI::Intercomm::Split,</cppname>
-<fname>MPI::Intracomm::Split</fname>
-<namespace></namespace>
-<description>Splits a communicator into multiple communicators based on color andkey.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_split</name>
-<arguments>MPI_Comm, int, int, MPI_Comm *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Comm_test_inter</cname>
-<cppname>MPI::Comm::Is_inter</cppname>
-<fname>MPI_COMM_TEST_INTER</fname>
-<namespace></namespace>
-<description>Returns the type of a communicator (intra-communicator or inter-communicator).</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Comm_test_inter</name>
-<arguments>MPI_Comm, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Dims_create</cname>
-<cppname>MPI::Compute_dims</cppname>
-<fname>MPI_DIMS_CREATE</fname>
-<namespace></namespace>
-<description>Defines a Cartesian grid to balance tasks.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Dims_create</name>
-<arguments>int, int, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Errhandler_create</cname>
-<cppname>(none)</cppname>
-<fname>MPI_ERRHANDLER_CREATE</fname>
-<namespace></namespace>
-<description>Registers a user-defined error handler.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Errhandler_create</name>
-<arguments>MPI_Handler_function *, MPI_Errhandler *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Errhandler_free</cname>
-<cppname>MPI::Errhandler::Free</cppname>
-<fname>MPI_ERRHANDLER_FREE</fname>
-<namespace></namespace>
-<description>Marks an error handler for deallocation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Errhandler_free</name>
-<arguments>MPI_Errhandler *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Errhandler_get</cname>
-<cppname>(none)</cppname>
-<fname>MPI_ERRHANDLER_GET</fname>
-<namespace></namespace>
-<description>Gets an error handler associated with a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Errhandler_get</name>
-<arguments>MPI_Comm, MPI_Errhandler *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Errhandler_set</cname>
-<cppname>(none)</cppname>
-<fname>MPI_ERRHANDLER_SET</fname>
-<namespace></namespace>
-<description>Associates a new error handler with a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Errhandler_set</name>
-<arguments>MPI_Comm, MPI_Errhandler</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Error_class</cname>
-<cppname>MPI::Get_error_class</cppname>
-<fname>MPI_ERROR_CLASS</fname>
-<namespace></namespace>
-<description>Returns the error class for the corresponding error code.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Error_class</name>
-<arguments>int, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Error_string</cname>
-<cppname>MPI::Get_error_string</cppname>
-<fname>MPI_ERROR_STRING</fname>
-<namespace></namespace>
-<description>Returns the error string for a given error code.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Error_string</name>
-<arguments>int, char *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Exscan</cname>
-<cppname>MPI::Intracomm::Exscan</cppname>
-<fname>MPI_EXSCAN</fname>
-<namespace></namespace>
-<description>Performs a prefix reduction on data distributed across the group.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Exscan</name>
-<arguments>void *, void *, int, MPI_Datatype, MPI_Op, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_File_c2f</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Translates a C file handle into a FORTRAN handle to the same file.</description>
-<prototype>
-<returnType>MPI_Fint</returnType>
-<name>MPI_File_c2f</name>
-<arguments>MPI_File</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_File_call_errhandler</cname>
-<cppname>MPI::File::Call_errhandler</cppname>
-<fname>MPI_FILE_CALL_ERRHANDLER</fname>
-<namespace></namespace>
-<description>Calls the error handler assigned to the file with the error code supplied.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_File_call_errhandler</name>
-<arguments>MPI_File, int</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_File_create_errhandler</cname>
-<cppname>MPI::File::Create_errhandler</cppname>
-<fname>MPI_FILE_CREATE_ERRHANDLER</fname>
-<namespace></namespace>
-<description>Registers a user-defined error handler that you can associate with an open file.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_File_create_errhandler</name>
-<arguments>MPI_File_errhandler_fn *, MPI_Errhandler *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_File_f2c</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Returns a C handle to a file.</description>
-<prototype>
-<returnType>MPI_File</returnType>
-<name>MPI_File_f2c</name>
-<arguments>MPI_Fint</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_File_get_errhandler</cname>
-<cppname>MPI::File::Get_errhandler</cppname>
-<fname>MPI_FILE_GET_ERRHANDLER</fname>
-<namespace></namespace>
-<description>Retrieves the error handler currently associated with a file handle.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_File_get_errhandler</name>
-<arguments>MPI_File, MPI_Errhandler *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_File_set_errhandler</cname>
-<cppname>MPI::File::Set_errhandler</cppname>
-<fname>MPI_FILE_SET_ERRHANDLER</fname>
-<namespace></namespace>
-<description>Associates a new error handler with a file.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_File_set_errhandler</name>
-<arguments>MPI_File, MPI_Errhandler</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Finalize</cname>
-<cppname>MPI::Finalize</cppname>
-<fname>MPI_FINALIZE</fname>
-<namespace></namespace>
-<description>Terminates all MPI processing.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Finalize</name>
-<arguments>void</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Finalized</cname>
-<cppname>MPI::Is_finalized</cppname>
-<fname>MPI_FINALIZED</fname>
-<namespace></namespace>
-<description>Returns true if MPI_FINALIZE has completed.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Finalized</name>
-<arguments>int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Free_mem</cname>
-<cppname>MPI::Free_mem</cppname>
-<fname>MPI_FREE_MEM</fname>
-<namespace></namespace>
-<description>Frees a block of storage.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Free_mem</name>
-<arguments>void *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Gather</cname>
-<cppname>MPI::Comm::Gather</cppname>
-<fname>MPI_GATHER</fname>
-<namespace></namespace>
-<description>Collects individual messages from each task in a group at the root task.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Gather</name>
-<arguments>void* , int, MPI_Datatype, void*, int, MPI_Datatype, int, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Gatherv</cname>
-<cppname>MPI::Comm::Gatherv</cppname>
-<fname>MPI_GATHERV</fname>
-<namespace></namespace>
-<description>Collects individual messages from each task incomm at the root task. Messages can have different sizes and displacements.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Gatherv</name>
-<arguments>void* , int, MPI_Datatype, void*, int *, int *, MPI_Datatype, int, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Get</cname>
-<cppname>MPI::Win::Get</cppname>
-<fname>MPI_GET</fname>
-<namespace></namespace>
-<description>Transfers data from a window at the target task to the origin task.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Get</name>
-<arguments>void *, int, MPI_Datatype, int, MPI_Aint, int, MPI_Datatype, MPI_Win</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Get_address</cname>
-<cppname>MPI::Get_address</cppname>
-<fname>MPI_GET_ADDRESS</fname>
-<namespace></namespace>
-<description>Returns the address of a location in memory.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Get_address</name>
-<arguments>void *, MPI_Aint *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Get_count</cname>
-<cppname>MPI::Status::Get_count</cppname>
-<fname>MPI_GET_COUNT</fname>
-<namespace></namespace>
-<description>Returns the number of elements in a message.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Get_count</name>
-<arguments>MPI_Status *, MPI_Datatype, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Get_elements</cname>
-<cppname>MPI::Status::Get_elements</cppname>
-<fname>MPI_GET_ELEMENTS</fname>
-<namespace></namespace>
-<description>Returns the number of basic elements in a message.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Get_elements</name>
-<arguments>MPI_Status *, MPI_Datatype, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Get_processor_name</cname>
-<cppname>MPI::Get_processor_name</cppname>
-<fname>MPI_GET_PROCESSOR_NAME</fname>
-<namespace></namespace>
-<description>Returns the name of the local processor.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Get_processor_name</name>
-<arguments>char *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Get_version</cname>
-<cppname>MPI::Get_version</cppname>
-<fname>MPI_GET_VERSION</fname>
-<namespace></namespace>
-<description>Returns the version of the MPI standard supported.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Get_version</name>
-<arguments>int *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Graph_create</cname>
-<cppname>MPI::Intracomm::Create_graph</cppname>
-<fname>MPI_GRAPH_CREATE</fname>
-<namespace></namespace>
-<description>Creates a new communicator containing graph topology information.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Graph_create</name>
-<arguments>MPI_Comm, int, int *, int *, int, MPI_Comm *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Graph_get</cname>
-<cppname>MPI::Graphcomm::Get_topo</cppname>
-<fname>MPI_GRAPH_GET</fname>
-<namespace></namespace>
-<description>Retrieves graph topology information from a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Graph_get</name>
-<arguments>MPI_Comm, int, int, int *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Graph_map</cname>
-<cppname>MPI::Graphcomm::Map</cppname>
-<fname>MPI_GRAPH_MAP</fname>
-<namespace></namespace>
-<description>Computes placement of tasks on the physical processor.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Graph_map</name>
-<arguments>MPI_Comm, int, int *, int *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Graph_neighbors</cname>
-<cppname>MPI::Graphcomm::Get_neighbors</cppname>
-<fname>MPI_GRAPH_NEIGHBORS</fname>
-<namespace></namespace>
-<description>Returns the neighbors of the given task.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Graph_neighbors</name>
-<arguments>MPI_Comm, int, int, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Graph_neighbors_count</cname>
-<cppname>MPI::Graphcomm::Get_neighbors_count</cppname>
-<fname>MPI_GRAPH_NEIGHBORS_COUNT</fname>
-<namespace></namespace>
-<description>Returns the number of neighbors of the given task.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Graph_neighbors_count</name>
-<arguments>MPI_Comm, int, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Graphdims_get</cname>
-<cppname>MPI::Graphcomm::Get_dims</cppname>
-<fname>MPI_GRAPHDIMS_GET</fname>
-<namespace></namespace>
-<description>Retrieves graph topology information from a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Graphdims_get</name>
-<arguments>MPI_Comm, int *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Grequest_complete</cname>
-<cppname>MPI::Grequest::Complete</cppname>
-<fname>MPI_GREQUEST_COMPLETE</fname>
-<namespace></namespace>
-<description>Marks the generalized request complete.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Grequest_complete</name>
-<arguments>MPI_Request</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Grequest_start</cname>
-<cppname>MPI::Grequest::Start</cppname>
-<fname>MPI_GREQUEST_START</fname>
-<namespace></namespace>
-<description>Initializes a generalized request.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Grequest_start</name>
-<arguments>MPI_Grequest_query_function *, MPI_Grequest_free_function *,MPI_Grequest_cancel_function *, void *, MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Group_c2f</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Translates a C group handle into a FORTRAN handle to the same group.</description>
-<prototype>
-<returnType>MPI_Fint</returnType>
-<name>MPI_Group_c2f</name>
-<arguments>MPI_Group</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Group_compare</cname>
-<cppname>MPI::Group::Compare</cppname>
-<fname>MPI_GROUP_COMPARE</fname>
-<namespace></namespace>
-<description>Compares the contents of two task groups.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Group_compare</name>
-<arguments>MPI_Group, MPI_Group, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Group_difference</cname>
-<cppname>MPI::Group::Difference</cppname>
-<fname>MPI_GROUP_DIFFERENCE</fname>
-<namespace></namespace>
-<description>Creates a new group that is the difference of two existing groups.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Group_difference</name>
-<arguments>MPI_Group, MPI_Group, MPI_Group *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Group_excl</cname>
-<cppname>MPI::Group::Excl</cppname>
-<fname>MPI_GROUP_EXCL</fname>
-<namespace></namespace>
-<description>Removes selected tasks from an existing group to create a new group.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Group_excl</name>
-<arguments>MPI_Group, int, int *, MPI_Group *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Group_f2c</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Returns a C handle to a group.</description>
-<prototype>
-<returnType>MPI_Group</returnType>
-<name>MPI_Group_f2c</name>
-<arguments>MPI_Fint</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Group_free</cname>
-<cppname>MPI::Group::Free</cppname>
-<fname>MPI_GROUP_FREE</fname>
-<namespace></namespace>
-<description>Marks a group for deallocation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Group_free</name>
-<arguments>MPI_Group *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Group_incl</cname>
-<cppname>MPI::Group::Incl</cppname>
-<fname>MPI_GROUP_INCL</fname>
-<namespace></namespace>
-<description>Creates a new group consisting of selected tasks from an existing group.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Group_incl</name>
-<arguments>MPI_Group, int, int *, MPI_Group *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Group_intersection</cname>
-<cppname>MPI::Group::Intersect</cppname>
-<fname>MPI_GROUP_INTERSECTION</fname>
-<namespace></namespace>
-<description>Creates a new group that is the intersection of two existing groups.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Group_intersection</name>
-<arguments>MPI_Group, MPI_Group, MPI_Group *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Group_range_excl</cname>
-<cppname>MPI::Group::Range_excl</cppname>
-<fname>MPI_GROUP_RANGE_EXCL</fname>
-<namespace></namespace>
-<description>Creates a new group by excluding selected tasks of an existing group.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Group_range_excl</name>
-<arguments>MPI_Group, int, int [][3], MPI_Group *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Group_range_incl</cname>
-<cppname>MPI::Group::Range_incl</cppname>
-<fname>MPI_GROUP_RANGE_INCL</fname>
-<namespace></namespace>
-<description>Creates a new group consisting of selected ranges of tasks from an existing group.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Group_range_incl</name>
-<arguments>MPI_Group, int, int [][3], MPI_Group *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Group_rank</cname>
-<cppname>MPI::Group::Get_rank</cppname>
-<fname>MPI_GROUP_RANK</fname>
-<namespace></namespace>
-<description>Returns the rank of the local task with respect to group.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Group_rank</name>
-<arguments>MPI_Group, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Group_size</cname>
-<cppname>MPI::Group::Get_size</cppname>
-<fname>MPI_GROUP_SIZE</fname>
-<namespace></namespace>
-<description>Returns the number of tasks in a group.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Group_size</name>
-<arguments>MPI_Group, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Group_union</cname>
-<cppname>MPI::Group::Union</cppname>
-<fname>MPI_GROUP_UNION</fname>
-<namespace></namespace>
-<description>Creates a new group that is the union of two existing groups.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Group_union</name>
-<arguments>MPI_Group, MPI_Group, MPI_Group *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Ibsend</cname>
-<cppname>MPI::Comm::Ibsend</cppname>
-<fname>MPI_IBSEND</fname>
-<namespace></namespace>
-<description>Performs a non-blocking buffered send.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Ibsend</name>
-<arguments>void*, int, MPI_Datatype, int, int, MPI_Comm, MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Info_c2f</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Translates a C Info object handle into a FORTRAN handle to the same Info object.</description>
-<prototype>
-<returnType>MPI_Fint</returnType>
-<name>MPI_Info_c2f</name>
-<arguments>MPI_Info</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Info_create</cname>
-<cppname>MPI::Info::Create</cppname>
-<fname>MPI_INFO_CREATE</fname>
-<namespace></namespace>
-<description>Creates a new, empty Info object.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Info_create</name>
-<arguments>MPI_Info *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Info_delete</cname>
-<cppname>MPI::Info::Delete</cppname>
-<fname>MPI_INFO_DELETE</fname>
-<namespace></namespace>
-<description>Deletes a (key, value) pair from an Info object.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Info_delete</name>
-<arguments>MPI_Info, char *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Info_dup</cname>
-<cppname>MPI::Info::Dup</cppname>
-<fname>MPI_INFO_DUP</fname>
-<namespace></namespace>
-<description>Duplicates an Info object.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Info_dup</name>
-<arguments>MPI_Info, MPI_Info *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Info_f2c</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Returns a C handle to an Info object.</description>
-<prototype>
-<returnType>MPI_Info</returnType>
-<name>MPI_Info_f2c</name>
-<arguments>MPI_Fint</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Info_free</cname>
-<cppname>MPI::Info::Free</cppname>
-<fname>MPI_INFO_FREE</fname>
-<namespace></namespace>
-<description>Frees an Info object and sets its handle to MPI_INFO_NULL.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Info_free</name>
-<arguments>MPI_Info *info</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Info_get</cname>
-<cppname>MPI::Info::Get</cppname>
-<fname>MPI_INFO_GET</fname>
-<namespace></namespace>
-<description>Retrieves the value associated withkey in an Info object.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Info_get</name>
-<arguments>MPI_Info, char *, int, char *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Info_get_nkeys</cname>
-<cppname>MPI::Info::Get_nkeys</cppname>
-<fname>MPI_INFO_GET_NKEYS</fname>
-<namespace></namespace>
-<description>Returns the number of keys defined in an Info object.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Info_get_nkeys</name>
-<arguments>MPI_Info, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Info_get_nthkey</cname>
-<cppname>MPI::Info::Get_nthkey</cppname>
-<fname>MPI_INFO_GET_NTHKEY</fname>
-<namespace></namespace>
-<description>Retrieves the nth key defined in an Info object.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Info_get_nthkey</name>
-<arguments>MPI_Info, int, char *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Info_get_valuelen</cname>
-<cppname>MPI::Info::Get_valuelen</cppname>
-<fname>MPI_INFO_GET_VALUELEN</fname>
-<namespace></namespace>
-<description>Retrieves the length of the value associated with a key of an Info object.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Info_get_valuelen</name>
-<arguments>MPI_Info, char *, int *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Info_set</cname>
-<cppname>MPI::Info::Set</cppname>
-<fname>MPI_INFO_SET</fname>
-<namespace></namespace>
-<description>Adds a (key, value) pair to an Info object.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Info_set</name>
-<arguments>MPI_Info, char *, char *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Init</cname>
-<cppname>MPI::Init</cppname>
-<fname>MPI_INIT</fname>
-<namespace></namespace>
-<description>Initializes MPI.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Init</name>
-<arguments>int *, char ***</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Init_thread</cname>
-<cppname>MPI::Init_thread</cppname>
-<fname>MPI_INIT_THREAD</fname>
-<namespace></namespace>
-<description>Initializes MPI and the MPI threads environment.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Init_thread</name>
-<arguments>int *, char ***, int, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Initialized</cname>
-<cppname>MPI::Is_initialized</cppname>
-<fname>MPI_INITIALIZED</fname>
-<namespace></namespace>
-<description>Determines if MPI is initialized.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Initialized</name>
-<arguments>int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Intercomm_create</cname>
-<cppname>MPI::Intracomm::Create_intercomm</cppname>
-<fname>MPI_INTERCOMM_CREATE</fname>
-<namespace></namespace>
-<description>Creates an inter-communicator from two intra-communicators.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Intercomm_create</name>
-<arguments>MPI_Comm, int, MPI_Comm, int, int, MPI_Comm * </arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Intercomm_merge</cname>
-<cppname>MPI::Intercomm::Merge</cppname>
-<fname>MPI_INTERCOMM_MERGE</fname>
-<namespace></namespace>
-<description>Creates an intra-communicator by merging the local and remote groups of an inter-communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Intercomm_merge</name>
-<arguments>MPI_Comm, int, MPI_Comm *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Iprobe</cname>
-<cppname>MPI::Comm::Iprobe</cppname>
-<fname>MPI_IPROBE</fname>
-<namespace></namespace>
-<description>Checks to see if a message matchingsource, tag, andcomm has arrived.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Iprobe</name>
-<arguments>int, int, MPI_Comm, int *, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Irecv</cname>
-<cppname>MPI::Comm::Irecv</cppname>
-<fname>MPI_IRECV</fname>
-<namespace></namespace>
-<description>Performs a non-blocking receive operation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Irecv</name>
-<arguments>void*, int, MPI_Datatype, int, int, MPI_Comm, MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Irsend</cname>
-<cppname>MPI::Comm::Irsend</cppname>
-<fname>MPI_IRSEND</fname>
-<namespace></namespace>
-<description>Performs a non-blocking ready send operation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Irsend</name>
-<arguments>void*, int, MPI_Datatype, int, int, MPI_Comm, MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Is_thread_main</cname>
-<cppname>MPI::Is_thread_main</cppname>
-<fname>MPI_IS_THREAD_MAIN</fname>
-<namespace></namespace>
-<description>Determines whether the calling thread is the thread that called MPI_INIT or MPI_INIT_THREAD.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Is_thread_main</name>
-<arguments>int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Isend</cname>
-<cppname>MPI::Comm::Isend</cppname>
-<fname>MPI_ISEND</fname>
-<namespace></namespace>
-<description>Performs a non-blocking standard mode send operation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Isend</name>
-<arguments>void*, int, MPI_Datatype, int, int, MPI_Comm, MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Issend</cname>
-<cppname>MPI::Comm::Issend</cppname>
-<fname>MPI_ISSEND</fname>
-<namespace></namespace>
-<description>Performs a non-blocking synchronous mode send operation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Issend</name>
-<arguments>void*, int, MPI_Datatype, int, int, MPI_Comm, MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Keyval_create</cname>
-<cppname>(none)</cppname>
-<fname>MPI_KEYVAL_CREATE</fname>
-<namespace></namespace>
-<description>Generates a new communicator attribute key.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Keyval_create</name>
-<arguments>MPI_Copy_function *, MPI_Delete_function *, int *, void*</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Keyval_free</cname>
-<cppname>(none)</cppname>
-<fname>MPI_KEYVAL_FREE</fname>
-<namespace></namespace>
-<description>Marks a communicator attribute key for deallocation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Keyval_free</name>
-<arguments>int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Op_c2f</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Translates a C reduction operation handle into a FORTRAN handle to the same operation.</description>
-<prototype>
-<returnType>MPI_Fint</returnType>
-<name>MPI_Op_c2f</name>
-<arguments>MPI_Op</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Op_create</cname>
-<cppname>MPI::Op::Init</cppname>
-<fname>MPI_OP_CREATE</fname>
-<namespace></namespace>
-<description>Binds a user-defined reduction operation to anop handle.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Op_create</name>
-<arguments>MPI_User_function *, int, MPI_Op *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Op_f2c</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Returns a C reduction operation handle to an operation.</description>
-<prototype>
-<returnType>MPI_Op</returnType>
-<name>MPI_Op_f2c</name>
-<arguments>MPI_Fint</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Op_free</cname>
-<cppname>MPI::Op::Free</cppname>
-<fname>MPI_OP_FREE</fname>
-<namespace></namespace>
-<description>Marks a user-defined reduction operation for deallocation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Op_free</name>
-<arguments> MPI_Op *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Pack</cname>
-<cppname>MPI::Datatype::Pack</cppname>
-<fname>MPI_PACK</fname>
-<namespace></namespace>
-<description>Packs the message in the specified send buffer into the specified buffer space.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Pack</name>
-<arguments>void*, int, MPI_Datatype, void *, int, int *,  MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Pack_external</cname>
-<cppname>MPI::Datatype::Pack_external</cppname>
-<fname>MPI_PACK_EXTERNAL</fname>
-<namespace></namespace>
-<description>Packs the message in the specified send buffer into the specified buffer space, using the external32 data format.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Pack_external</name>
-<arguments>char *, void *, int, MPI_Datatype, void *, MPI_Aint, MPI_Aint *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Pack_external_size</cname>
-<cppname>MPI::Datatype::Pack_external_size</cppname>
-<fname>MPI_PACK_EXTERNAL_SIZE</fname>
-<namespace></namespace>
-<description>Returns the number of bytes required to hold the data, using the external32 data format.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Pack_external_size</name>
-<arguments>char *, int, MPI_Datatype, MPI_Aint *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Pack_size</cname>
-<cppname>MPI::Datatype::Pack_size</cppname>
-<fname>MPI_PACK_SIZE</fname>
-<namespace></namespace>
-<description>Returns the number of bytes required to hold the data.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Pack_size</name>
-<arguments>int, MPI_Datatype, MPI_Comm, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Pcontrol</cname>
-<cppname>MPI::Pcontrol</cppname>
-<fname>MPI_PCONTROL</fname>
-<namespace></namespace>
-<description>Provides profile control.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Pcontrol</name>
-<arguments>const int, ...</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Probe</cname>
-<cppname>MPI::Comm::Probe</cppname>
-<fname>MPI_PROBE</fname>
-<namespace></namespace>
-<description>Waits until a message matching source, tag, and comm arrives.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Probe</name>
-<arguments>int, int, MPI_Comm, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Put</cname>
-<cppname>MPI::Win::Put</cppname>
-<fname>MPI_PUT</fname>
-<namespace></namespace>
-<description>Transfers data from the origin task to a window at the target task.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Put</name>
-<arguments>void *, int, MPI_Datatype, int, MPI_Aint, int, MPI_Datatype, MPI_Win</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Query_thread</cname>
-<cppname>MPI::Query_thread</cppname>
-<fname>MPI_QUERY_THREAD</fname>
-<namespace></namespace>
-<description>Returns the current level of threads support.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Query_thread</name>
-<arguments>int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Recv</cname>
-<cppname>MPI::Comm::Recv</cppname>
-<fname>MPI_RECV</fname>
-<namespace></namespace>
-<description>Performs a blocking receive operation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Recv</name>
-<arguments>void*, int, MPI_Datatype, int, int, MPI_Comm, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Recv_init</cname>
-<cppname>MPI::Comm::Recv_init</cppname>
-<fname>MPI_RECV_INIT</fname>
-<namespace></namespace>
-<description>Creates a persistent receive request.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Recv_init</name>
-<arguments>void*, int, MPI_Datatype, int,int, MPI_Comm, MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Reduce</cname>
-<cppname>MPI::Comm::Reduce</cppname>
-<fname>MPI_REDUCE</fname>
-<namespace></namespace>
-<description>Applies a reduction operation to the vectorsendbuf over the set of tasks specified bycomm and places the result in recvbuf on root.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Reduce</name>
-<arguments>void* , void*, int, MPI_Datatype, MPI_Op, int, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Reduce_scatter</cname>
-<cppname>MPI::Comm::Reduce_scatter</cppname>
-<fname>MPI_REDUCE_SCATTER</fname>
-<namespace></namespace>
-<description>Applies a reduction operation to the vectorsendbuf over the set of tasks specified bycomm and scatters the result according to the values in recvcounts.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Reduce_scatter</name>
-<arguments>void* , void*, int *, MPI_Datatype, MPI_Op, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Request_c2f</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Translates a C request handle into a FORTRAN handle to the same request.</description>
-<prototype>
-<returnType>MPI_Fint</returnType>
-<name>MPI_Request_c2f</name>
-<arguments>MPI_Request</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Request_f2c</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Returns a C handle to a request.</description>
-<prototype>
-<returnType>MPI_Request</returnType>
-<name>MPI_Request_f2c</name>
-<arguments>MPI_Fint</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Request_free</cname>
-<cppname>MPI::Request::Free</cppname>
-<fname>MPI_REQUEST_FREE</fname>
-<namespace></namespace>
-<description>Marks a request for deallocation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Request_free</name>
-<arguments>MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Request_get_status</cname>
-<cppname>MPI::Request::Get_status</cppname>
-<fname>MPI_REQUEST_GET_STATUS</fname>
-<namespace></namespace>
-<description>Accesses the information associated with a request, without freeing the request.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Request_get_status</name>
-<arguments>MPI_Request, int *, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Rsend</cname>
-<cppname>MPI::Comm::Rsend</cppname>
-<fname>MPI_RSEND</fname>
-<namespace></namespace>
-<description>Performs a blocking ready mode send operation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Rsend</name>
-<arguments>void*, int, MPI_Datatype, int, int, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Rsend_init</cname>
-<cppname>MPI::Comm::Rsend_init</cppname>
-<fname>MPI_RSEND_INIT</fname>
-<namespace></namespace>
-<description>Creates a persistent ready mode send request.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Rsend_init</name>
-<arguments>void*, int, MPI_Datatype, int,int, MPI_Comm, MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Scan</cname>
-<cppname>MPI::Intracomm::Scan</cppname>
-<fname>MPI_SCAN</fname>
-<namespace></namespace>
-<description>Performs a parallel prefix reduction on data distributed across a group.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Scan</name>
-<arguments>void* , void*, int, MPI_Datatype, MPI_Op, MPI_Comm </arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Scatter</cname>
-<cppname>MPI::Comm::Scatter</cppname>
-<fname>MPI_SCATTER</fname>
-<namespace></namespace>
-<description>Distributes individual messages fromroot to each task in comm.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Scatter</name>
-<arguments>void* , int, MPI_Datatype, void*, int, MPI_Datatype, int, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Scatterv</cname>
-<cppname>MPI::Comm::Scatterv</cppname>
-<fname>MPI_SCATTERV</fname>
-<namespace></namespace>
-<description>Distributes individual messages fromroot to each task in comm. Messages can have different sizes and displacements.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Scatterv</name>
-<arguments>void* , int *, int *,  MPI_Datatype, void*, int, MPI_Datatype, int, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Send</cname>
-<cppname>MPI::Comm::Send</cppname>
-<fname>MPI_SEND</fname>
-<namespace></namespace>
-<description>Blocking standard mode send.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Send</name>
-<arguments>void*, int, MPI_Datatype, int, int, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Send_init</cname>
-<cppname>MPI::Comm::Send_init</cppname>
-<fname>MPI_SEND_INIT</fname>
-<namespace></namespace>
-<description>Creates a persistent standard mode send request.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Send_init</name>
-<arguments>void*, int, MPI_Datatype, int, int, MPI_Comm, MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Sendrecv</cname>
-<cppname>MPI::Comm::Sendrecv</cppname>
-<fname>MPI_SENDRECV</fname>
-<namespace></namespace>
-<description>Performs a blocking send and receive operation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Sendrecv</name>
-<arguments>void *, int, MPI_Datatype,int, int, void *, int, MPI_Datatype, int, int, MPI_Comm, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Sendrecv_replace</cname>
-<cppname>MPI::Comm::Sendrecv_replace</cppname>
-<fname>MPI_SENDRECV_REPLACE</fname>
-<namespace></namespace>
-<description>Performs a blocking send and receive operation using a common buffer.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Sendrecv_replace</name>
-<arguments>void*, int, MPI_Datatype, int, int, int, int, MPI_Comm, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Ssend</cname>
-<cppname>MPI::Comm::Ssend</cppname>
-<fname>MPI_SSEND</fname>
-<namespace></namespace>
-<description>Performs a blocking synchronous mode send operation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Ssend</name>
-<arguments>void*, int, MPI_Datatype, int, int, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Ssend_init</cname>
-<cppname>MPI::Comm::Ssend_init</cppname>
-<fname>MPI_SSEND_INIT</fname>
-<namespace></namespace>
-<description>Creates a persistent synchronous mode send request.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Ssend_init</name>
-<arguments>void*, int, MPI_Datatype, int,int, MPI_Comm, MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Start</cname>
-<cppname>MPI::Prequest::Start</cppname>
-<fname>MPI_START</fname>
-<namespace></namespace>
-<description>Activates a persistent request operation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Start</name>
-<arguments>MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Startall</cname>
-<cppname>MPI::Prequest::Startall</cppname>
-<fname>MPI_STARTALL</fname>
-<namespace></namespace>
-<description>Activates a collection of persistent request operations.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Startall</name>
-<arguments>int, MPI_Request *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Status_c2f</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Translates a C status object into a FORTRAN status object.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Status_c2f</name>
-<arguments>MPI_Status *, MPI_Fint *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Status_f2c</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Converts a FORTRAN status object into a C status object.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Status_f2c</name>
-<arguments>MPI_Fint *, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Status_set_cancelled</cname>
-<cppname>MPI::Status::Set_cancelled</cppname>
-<fname>MPI_STATUS_SET_CANCELLED</fname>
-<namespace></namespace>
-<description>Defines cancellation information for a request.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Status_set_cancelled</name>
-<arguments>MPI_Status *, int</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Status_set_elements</cname>
-<cppname>MPI::Status::Set_elements</cppname>
-<fname>MPI_STATUS_SET_ELEMENTS</fname>
-<namespace></namespace>
-<description>Defines element information for a request.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Status_set_elements</name>
-<arguments>MPI_Status *, MPI_Datatype, int</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Test</cname>
-<cppname>MPI::Request::Test</cppname>
-<fname>MPI_TEST</fname>
-<namespace></namespace>
-<description>Checks to see if a non-blocking operation has completed.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Test</name>
-<arguments>MPI_Request *, int *, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Test_cancelled</cname>
-<cppname>MPI::Status::Is_cancelled</cppname>
-<fname>MPI_TEST_CANCELLED</fname>
-<namespace></namespace>
-<description>Tests whether a non-blocking operation was cancelled.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Test_cancelled</name>
-<arguments>MPI_Status *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Testall</cname>
-<cppname>MPI::Request::Testall</cppname>
-<fname>MPI_TESTALL</fname>
-<namespace></namespace>
-<description>Tests a collection of non-blocking operations for completion.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Testall</name>
-<arguments>int, MPI_Request *, int *, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Testany</cname>
-<cppname>MPI::Request::Testany</cppname>
-<fname>MPI_TESTANY</fname>
-<namespace></namespace>
-<description>Tests for the completion of any specified non-blocking operation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Testany</name>
-<arguments>int, MPI_Request *, int *, int *, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Testsome</cname>
-<cppname>MPI::Request::Testsome</cppname>
-<fname>MPI_TESTSOME</fname>
-<namespace></namespace>
-<description>Tests a collection of non-blocking operations for completion.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Testsome</name>
-<arguments>int, MPI_Request *, int *, int *, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Topo_test</cname>
-<cppname>MPI::Comm::Get_topology</cppname>
-<fname>MPI_TOPO_TEST</fname>
-<namespace></namespace>
-<description>Returns the type of virtual topology associated with a communicator.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Topo_test</name>
-<arguments>MPI_Comm, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_c2f</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Translates a C datatype handle into a FORTRAN handle to the same datatype.</description>
-<prototype>
-<returnType>MPI_Fint</returnType>
-<name>MPI_Type_c2f</name>
-<arguments>MPI_Datatype</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_commit</cname>
-<cppname>MPI::Datatype::Commit</cppname>
-<fname>MPI_TYPE_COMMIT</fname>
-<namespace></namespace>
-<description>Makes a datatype ready for use in communication.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_commit</name>
-<arguments>MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_contiguous</cname>
-<cppname>MPI::Datatype::Create_contiguous</cppname>
-<fname>MPI_TYPE_CONTIGUOUS</fname>
-<namespace></namespace>
-<description>Returns a new datatype that represents the concatenation of count instances ofoldtype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_contiguous</name>
-<arguments>int, MPI_Datatype, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_create_darray</cname>
-<cppname>MPI::Datatype::Create_darray</cppname>
-<fname>MPI_TYPE_CREATE_DARRAY</fname>
-<namespace></namespace>
-<description>Generates the datatypes corresponding to an HPF-like distribution of an ndims-dimensional array of oldtype elements onto anndims-dimensional grid of logical tasks.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_create_darray</name>
-<arguments>int, int, int, int [], int [], int [], int [], int,MPI_Datatype, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_create_f90_complex</cname>
-<cppname>MPI::Datatype::Create_f90_complex</cppname>
-<fname>MPI_TYPE_CREATE_F90_COMPLEX</fname>
-<namespace></namespace>
-<description>Returns a predefined MPI datatype that matches a COMPLEX variable of KIND selected_real_kind(p, r).</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_create_f90_complex</name>
-<arguments> int, int, MPI_Datatype * </arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_create_f90_integer</cname>
-<cppname>MPI::Datatype::Create_f90_integer</cppname>
-<fname>MPI_TYPE_CREATE_F90_INTEGER</fname>
-<namespace></namespace>
-<description>Returns a predefined MPI datatype that matches an INTEGER variable of KIND selected_integer_kind(r).</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_create_f90_integer</name>
-<arguments> int, MPI_Datatype * </arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_create_f90_real</cname>
-<cppname>MPI::Datatype::Create_f90_real</cppname>
-<fname>MPI_TYPE_CREATE_F90_REAL</fname>
-<namespace></namespace>
-<description>Returns a predefined MPI datatype that matches a REAL variable of KIND selected_real_kind(p, r).</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_create_f90_real</name>
-<arguments> int, int, MPI_Datatype * </arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_create_hindexed</cname>
-<cppname>MPI::Datatype::Create_hindexed</cppname>
-<fname>MPI_TYPE_CREATE_HINDEXED</fname>
-<namespace></namespace>
-<description>Returns a new datatype that representscount blocks. Each block is defined by an entry in array_of_blocklengths andarray_of_displacements. Displacements are expressed in bytes.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_create_hindexed</name>
-<arguments>int, int [], MPI_Aint [], MPI_Datatype, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_create_hvector</cname>
-<cppname>MPI::Datatype::Create_hvector</cppname>
-<fname>MPI_TYPE_CREATE_HVECTOR</fname>
-<namespace></namespace>
-<description>Returns a new datatype that represents equally-spaced blocks. The spacing between the start of each block is given in bytes.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_create_hvector</name>
-<arguments>int, int, MPI_Aint, MPI_Datatype, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_create_indexed_block</cname>
-<cppname>MPI::Datatype::Create_indexed_block</cppname>
-<fname>MPI_TYPE_CREATE_INDEXED_BLOCK</fname>
-<namespace></namespace>
-<description>Returns a new datatype that representscount blocks.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_create_indexed_block</name>
-<arguments>int, int, int [], MPI_Datatype, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_create_keyval</cname>
-<cppname>MPI::Datatype::Create_keyval</cppname>
-<fname>MPI_TYPE_CREATE_KEYVAL</fname>
-<namespace></namespace>
-<description>Generates a new attribute key for a datatype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_create_keyval</name>
-<arguments>MPI_Type_copy_attr_function *, MPI_Type_delete_attr_function *, int *, void *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_create_resized</cname>
-<cppname>MPI::Datatype::Create_resized</cppname>
-<fname>MPI_TYPE_CREATE_RESIZED</fname>
-<namespace></namespace>
-<description>Duplicates a datatype and changes the upper bound, lower bound, and extent.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_create_resized</name>
-<arguments>MPI_Datatype, MPI_Aint, MPI_Aint, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_create_struct</cname>
-<cppname>MPI::Datatype::Create_struct</cppname>
-<fname>MPI_TYPE_CREATE_STRUCT</fname>
-<namespace></namespace>
-<description>Returns a new datatype that representscount blocks. Each block is defined by an entry in array_of_blocklengths,array_of_displacements, and array_of_types. Displacements are expressed in bytes.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_create_struct</name>
-<arguments>int, int [], MPI_Aint [], MPI_Datatype [], MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_create_subarray</cname>
-<cppname>MPI::Datatype::Create_subarray</cppname>
-<fname>MPI_TYPE_CREATE_SUBARRAY</fname>
-<namespace></namespace>
-<description>Returns a new datatype that represents anndims-dimensional subarray of anndims-dimensional array.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_create_subarray</name>
-<arguments>int, int [], int [], int [], int, MPI_Datatype, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_delete_attr</cname>
-<cppname>MPI::Datatype::Delete_attr</cppname>
-<fname>MPI_TYPE_DELETE_ATTR</fname>
-<namespace></namespace>
-<description>Deletes an attribute from a datatype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_delete_attr</name>
-<arguments>MPI_Datatype, int</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_dup</cname>
-<cppname>MPI::Datatype::Dup</cppname>
-<fname>MPI_TYPE_DUP</fname>
-<namespace></namespace>
-<description>Duplicates the existing type with associated key values.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_dup</name>
-<arguments>MPI_Datatype, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_extent</cname>
-<cppname>(none)</cppname>
-<fname>MPI_TYPE_EXTENT</fname>
-<namespace></namespace>
-<description>Returns the extent of any defined datatype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_extent</name>
-<arguments>MPI_Datatype, MPI_Aint *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_f2c</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Returns a C handle to a datatype.</description>
-<prototype>
-<returnType>MPI_Datatype</returnType>
-<name>MPI_Type_f2c</name>
-<arguments>MPI_Fint</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_free</cname>
-<cppname>MPI::Datatype::Free</cppname>
-<fname>MPI_TYPE_FREE</fname>
-<namespace></namespace>
-<description>Marks a derived datatype for deallocation and sets its handle to MPI_DATATYPE_NULL.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_free</name>
-<arguments>MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_free_keyval</cname>
-<cppname>MPI::Datatype::Free_keyval</cppname>
-<fname>MPI_TYPE_FREE_KEYVAL</fname>
-<namespace></namespace>
-<description>Frees a datatype key value.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_free_keyval</name>
-<arguments>int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_get_attr</cname>
-<cppname>MPI::Datatype::Get_attr</cppname>
-<fname>MPI_TYPE_GET_ATTR</fname>
-<namespace></namespace>
-<description>Attaches an attribute to a datatype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_get_attr</name>
-<arguments>MPI_Datatype, int, void *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_get_contents</cname>
-<cppname>MPI::Datatype::Get_contents</cppname>
-<fname>MPI_TYPE_GET_CONTENTS</fname>
-<namespace></namespace>
-<description>Obtains the arguments used in the creation of the datatype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_get_contents</name>
-<arguments>MPI_Datatype, int, int, int, int [], MPI_Aint [], MPI_Datatype []</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_get_envelope</cname>
-<cppname>MPI::Datatype::Get_envelope</cppname>
-<fname>MPI_TYPE_GET_ENVELOPE</fname>
-<namespace></namespace>
-<description>Determines the constructor that was used to create the datatype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_get_envelope</name>
-<arguments>MPI_Datatype, int *, int *, int *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_get_extent</cname>
-<cppname>MPI::Datatype::Get_extent</cppname>
-<fname>MPI_TYPE_GET_EXTENT</fname>
-<namespace></namespace>
-<description>Returns the lower bound and the extent of any defined datatype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_get_extent</name>
-<arguments>MPI_Datatype, MPI_Aint *, MPI_Aint *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_get_name</cname>
-<cppname>MPI::Datatype::Get_name</cppname>
-<fname>MPI_TYPE_GET_NAME</fname>
-<namespace></namespace>
-<description>Returns the name that was last associated with a datatype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_get_name</name>
-<arguments>MPI_Datatype, char *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_get_true_extent</cname>
-<cppname>MPI::Datatype::Get_true_extent</cppname>
-<fname>MPI_TYPE_GET_TRUE_EXTENT</fname>
-<namespace></namespace>
-<description>Returns the true extent of any defined datatype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_get_true_extent</name>
-<arguments>MPI_Datatype, MPI_Aint *, MPI_Aint *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_hindexed</cname>
-<cppname>(none)</cppname>
-<fname>MPI_TYPE_HINDEXED</fname>
-<namespace></namespace>
-<description>Returns a new datatype that representscount distinct blocks with offsets expressed in bytes.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_hindexed</name>
-<arguments>int, int *, MPI_Aint *, MPI_Datatype, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_hvector</cname>
-<cppname>(none)</cppname>
-<fname>MPI_TYPE_HVECTOR</fname>
-<namespace></namespace>
-<description>Returns a new datatype of count blocks with stride expressed in bytes.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_hvector</name>
-<arguments>int, int, MPI_Aint, MPI_Datatype, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_indexed</cname>
-<cppname>MPI::Datatype::Create_indexed</cppname>
-<fname>MPI_TYPE_INDEXED</fname>
-<namespace></namespace>
-<description>Returns a new datatype that representscount blocks with stride in terms of defining type.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_indexed</name>
-<arguments>int, int *, int *, MPI_Datatype, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_lb</cname>
-<cppname>(none)</cppname>
-<fname>MPI_TYPE_LB</fname>
-<namespace></namespace>
-<description>Returns the lower bound of a datatype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_lb</name>
-<arguments>MPI_Datatype, MPI_Aint *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_match_size</cname>
-<cppname>MPI::Datatype::Match_size</cppname>
-<fname>MPI_TYPE_CREATE_MATCH_SIZE</fname>
-<namespace></namespace>
-<description>Returns a reference (handle) to one of the predefined named datatypes, not a duplicate.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_match_size</name>
-<arguments> int, int, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_set_attr</cname>
-<cppname>MPI::Datatype::Set_attr</cppname>
-<fname>MPI_TYPE_SET_ATTR</fname>
-<namespace></namespace>
-<description>Attaches the datatype attribute value to the datatype and associates it with the key.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_set_attr</name>
-<arguments>MPI_Datatype, int, void *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_set_name</cname>
-<cppname>MPI::Datatype::Set_name</cppname>
-<fname>MPI_TYPE_SET_NAME</fname>
-<namespace></namespace>
-<description>Associates a name string with a datatype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_set_name</name>
-<arguments>MPI_Datatype, char *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_size</cname>
-<cppname>MPI::Datatype::Get_size</cppname>
-<fname>MPI_TYPE_SIZE</fname>
-<namespace></namespace>
-<description>Returns the number of bytes represented by any defined datatype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_size</name>
-<arguments>MPI_Datatype, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_struct</cname>
-<cppname>(none)</cppname>
-<fname>MPI_TYPE_STRUCT</fname>
-<namespace></namespace>
-<description>Returns a new datatype that representscount blocks, each with a distinct format and offset.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_struct</name>
-<arguments>int, int *, MPI_Aint *, MPI_Datatype *, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_ub</cname>
-<cppname>(none)</cppname>
-<fname>MPI_TYPE_UB</fname>
-<namespace></namespace>
-<description>Returns the upper bound of a datatype.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_ub</name>
-<arguments>MPI_Datatype, MPI_Aint *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Type_vector</cname>
-<cppname>MPI::Datatype::Create_vector</cppname>
-<fname>MPI_TYPE_VECTOR</fname>
-<namespace></namespace>
-<description>Returns a new datatype that represents equally-spaced blocks of replicated data.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Type_vector</name>
-<arguments>int, int, int, MPI_Datatype, MPI_Datatype *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Unpack</cname>
-<cppname>MPI::Datatype::Unpack</cppname>
-<fname>MPI_UNPACK</fname>
-<namespace></namespace>
-<description>Unpacks the message into the specified receive buffer from the specified packed buffer.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Unpack</name>
-<arguments>void*, int, int *, void *, int, MPI_Datatype, MPI_Comm</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Unpack_external</cname>
-<cppname>MPI::Datatype::Unpack_external</cppname>
-<fname>MPI_UNPACK_EXTERNAL</fname>
-<namespace></namespace>
-<description>Unpacks the message into the specified receive buffer from the specified packed buffer, using the external32 data format.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Unpack_external</name>
-<arguments>char *, void *, MPI_Aint, MPI_Aint *, void *, int, MPI_Datatype</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Wait</cname>
-<cppname>MPI::Request::Wait</cppname>
-<fname>MPI_WAIT</fname>
-<namespace></namespace>
-<description>Waits for a non-blocking operation to complete.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Wait</name>
-<arguments>MPI_Request *, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Waitall</cname>
-<cppname>MPI::Request::Waitall</cppname>
-<fname>MPI_WAITALL</fname>
-<namespace></namespace>
-<description>Waits for a collection of non-blocking operations to complete.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Waitall</name>
-<arguments>int, MPI_Request *, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Waitany</cname>
-<cppname>MPI::Request::Waitany</cppname>
-<fname>MPI_WAITANY</fname>
-<namespace></namespace>
-<description>Waits for any specified non-blocking operation to complete.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Waitany</name>
-<arguments>int, MPI_Request *, int *, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Waitsome</cname>
-<cppname>MPI::Request::Waitsome</cppname>
-<fname>MPI_WAITSOME</fname>
-<namespace></namespace>
-<description>Waits for at least one of a list of non-blocking operations to complete.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Waitsome</name>
-<arguments>int, MPI_Request *, int *, int *, MPI_Status *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_c2f</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Translates a C window handle into a FORTRAN handle to the same window.</description>
-<prototype>
-<returnType>MPI_Fint</returnType>
-<name>MPI_Win_c2f</name>
-<arguments>MPI_Win</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_call_errhandler</cname>
-<cppname>MPI::Win::Call_errhandler</cppname>
-<fname>MPI_WIN_CALL_ERRHANDLER</fname>
-<namespace></namespace>
-<description>Calls the error handler assigned to the window with the error code supplied.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_call_errhandler</name>
-<arguments>MPI_Win, int</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_complete</cname>
-<cppname>MPI::Win::Complete</cppname>
-<fname>MPI_WIN_COMPLETE</fname>
-<namespace></namespace>
-<description>Completes an RMA access epoch on a window object.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_complete</name>
-<arguments>MPI_Win</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_create</cname>
-<cppname>MPI::Win::Create</cppname>
-<fname>MPI_WIN_CREATE</fname>
-<namespace></namespace>
-<description>Allows each task in an intra-communicator group to specify a "window" in its memory that is made accessible to accesses by remote tasks.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_create</name>
-<arguments>void *, MPI_Aint, int, MPI_Info, MPI_Comm, MPI_Win *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_create_errhandler</cname>
-<cppname>MPI::Win::Create_errhandler</cppname>
-<fname>MPI_WIN_CREATE_ERRHANDLER</fname>
-<namespace></namespace>
-<description>Creates an error handler that can be attached to windows.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_create_errhandler</name>
-<arguments>MPI_Win_errhandler_fn *, MPI_Errhandler *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_create_keyval</cname>
-<cppname>MPI::Win::Create_keyval</cppname>
-<fname>MPI_WIN_CREATE_KEYVAL</fname>
-<namespace></namespace>
-<description>Generates a new window attribute key.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_create_keyval</name>
-<arguments>MPI_Win_copy_attr_function *, MPI_Win_delete_attr_function *, int *, void *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_delete_attr</cname>
-<cppname>MPI::Win::Delete_attr</cppname>
-<fname>MPI_WIN_DELETE_ATTR</fname>
-<namespace></namespace>
-<description>Deletes an attribute from a window.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_delete_attr</name>
-<arguments>MPI_Win, int</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_f2c</cname>
-<cppname>(none)</cppname>
-<fname>(none)</fname>
-<namespace></namespace>
-<description>Returns a C handle to a window.</description>
-<prototype>
-<returnType>MPI_Win</returnType>
-<name>MPI_Win_f2c</name>
-<arguments>MPI_Fint</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_fence</cname>
-<cppname>MPI::Win::Fence</cppname>
-<fname>MPI_WIN_FENCE</fname>
-<namespace></namespace>
-<description>Synchronizes RMA calls on a window.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_fence</name>
-<arguments>int, MPI_Win</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_free</cname>
-<cppname>MPI::Win::Free</cppname>
-<fname>MPI_WIN_FREE</fname>
-<namespace></namespace>
-<description>Frees the window object and returns a null handle (equal to MPI_WIN_NULL).</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_free</name>
-<arguments>MPI_Win *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_free_keyval</cname>
-<cppname>MPI::Win::Free_keyval</cppname>
-<fname>MPI_WIN_FREE_KEYVAL</fname>
-<namespace></namespace>
-<description>Marks a window attribute key for deallocation.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_free_keyval</name>
-<arguments>int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_get_attr</cname>
-<cppname>MPI::Win::Get_attr</cppname>
-<fname>MPI_WIN_GET_ATTR</fname>
-<namespace></namespace>
-<description>Retrieves the window attribute value identified by the key.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_get_attr</name>
-<arguments>MPI_Win, int, void *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_get_errhandler</cname>
-<cppname>MPI::Win::Get_errhandler</cppname>
-<fname>MPI_WIN_GET_ERRHANDLER</fname>
-<namespace></namespace>
-<description>Retrieves the error handler currently associated with a window.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_get_errhandler</name>
-<arguments>MPI_Win, MPI_Errhandler *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_get_group</cname>
-<cppname>MPI::Win::Get_group</cppname>
-<fname>MPI_WIN_GET_GROUP</fname>
-<namespace></namespace>
-<description>Returns a duplicate of the group of the communicator used to create a window.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_get_group</name>
-<arguments>MPI_Win, MPI_Group *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_get_name</cname>
-<cppname>MPI::Win::Get_name</cppname>
-<fname>MPI_WIN_GET_NAME</fname>
-<namespace></namespace>
-<description>Returns the name that was last associated with a window.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_get_name</name>
-<arguments>MPI_Win, char *, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_lock</cname>
-<cppname>MPI::Win::Lock</cppname>
-<fname>MPI_WIN_LOCK</fname>
-<namespace></namespace>
-<description>Starts an RMA access epoch at the target task.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_lock</name>
-<arguments>int, int, int, MPI_Win</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_post</cname>
-<cppname>MPI::Win::Post</cppname>
-<fname>MPI_WIN_POST</fname>
-<namespace></namespace>
-<description>Starts an RMA exposure epoch for a local window.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_post</name>
-<arguments>MPI_Group, int, MPI_Win</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_set_attr</cname>
-<cppname>MPI::Win::Set_attr</cppname>
-<fname>MPI_WIN_SET_ATTR</fname>
-<namespace></namespace>
-<description>Attaches the window attribute value to the window and associates it with the key.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_set_attr</name>
-<arguments>MPI_Win, int, void *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_set_errhandler</cname>
-<cppname>MPI::Win::Set_errhandler</cppname>
-<fname>MPI_WIN_SET_ERRHANDLER</fname>
-<namespace></namespace>
-<description>Attaches a new error handler to a window.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_set_errhandler</name>
-<arguments>MPI_Win, MPI_Errhandler</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_set_name</cname>
-<cppname>MPI::Win::Set_name</cppname>
-<fname>MPI_WIN_SET_NAME</fname>
-<namespace></namespace>
-<description>Associates a name string with a window.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_set_name</name>
-<arguments>MPI_Win, char *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_start</cname>
-<cppname>MPI::Win::Start</cppname>
-<fname>MPI_WIN_START</fname>
-<namespace></namespace>
-<description>Starts an RMA access epoch for a window object.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_start</name>
-<arguments>MPI_Group, int, MPI_Win</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_test</cname>
-<cppname>MPI::Win::Test</cppname>
-<fname>MPI_WIN_TEST</fname>
-<namespace></namespace>
-<description>Tries to complete an RMA exposure epoch.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_test</name>
-<arguments>MPI_Win, int *</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_unlock</cname>
-<cppname>MPI::Win::Unlock</cppname>
-<fname>MPI_WIN_UNLOCK</fname>
-<namespace></namespace>
-<description>Completes an RMA access epoch at the target task.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_unlock</name>
-<arguments>int, MPI_Win</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Win_wait</cname>
-<cppname>MPI::Win::Wait</cppname>
-<fname>MPI_WIN_WAIT</fname>
-<namespace></namespace>
-<description>Completes an RMA exposure epoch.</description>
-<prototype>
-<returnType>int</returnType>
-<name>MPI_Win_wait</name>
-<arguments>MPI_Win</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Wtick</cname>
-<cppname>MPI::Wtick</cppname>
-<fname>MPI_WTICK</fname>
-<namespace></namespace>
-<description>Returns the resolution of MPI_WTIME in seconds.</description>
-<prototype>
-<returnType>double</returnType>
-<name>MPI_Wtick</name>
-<arguments>void</arguments>
-</prototype>
-</function>
-
-<function>
-<cname>MPI_Wtime</cname>
-<cppname>MPI::Wtime</cppname>
-<fname>MPI_WTIME</fname>
-<namespace></namespace>
-<description>Returns the current value of time as a floating-point value.</description>
-<prototype>
-<returnType>double</returnType>
-<name>MPI_Wtime</name>
-<arguments>void</arguments>
-</prototype>
-</function>
-
-</allFunctions>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/plugin.properties b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/plugin.properties
deleted file mode 100644
index 1572c13..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/plugin.properties
+++ /dev/null

@@ -1,19 +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 Parallel Language Development Tools MPI Support
-pluginProvider=Eclipse.org
-
-view.name = MPI Artifact View
-extension.name = MPI Artifact Marker
-specification.label = MPI Annotation Marker
-page.name = MPI
-command.name = find mpi artifacts
-extension.name.0 = tempNAME
-command.label = Show MPI Artifacts
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/plugin.xml b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/plugin.xml
deleted file mode 100644
index e6134a7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/plugin.xml
+++ /dev/null

@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-   <extension
-         point="org.eclipse.ui.views">
-      <view
-            name="%view.name"
-            icon="icons/mpi.gif"
-            category="org.eclipse.ptp.ui.views"
-            class="org.eclipse.ptp.pldt.mpi.core.views.MPITableView"
-            id="org.eclipse.ptp.pldt.mpi.core.views.MPITableView">
-      </view>
-
-   </extension>
-   <!--  MPI markers -->
-   <extension point="org.eclipse.core.resources.markers"
-		id="mpiMarker"
-        name="%extension.name">
-      <super type="org.eclipse.core.resources.textmarker"/>
-      <attribute name="fileName"/>
-      <attribute name="theLineNo"/>
-      <attribute name="theNewLineNo"/>
-      <attribute name="columnNo"/>
-      <attribute name="name"/>
-      <attribute name="description"/>
-      <attribute name="constructType"/>
-      <attribute name="uniqueID"/>
-   </extension>
-   <!-- this changes the marker image in the editor marker bar  -->
-   <extension
-         point="org.eclipse.ui.editors.annotationTypes">
-      <type
-            markerType="org.eclipse.ptp.pldt.mpi.core.mpiMarker"
-            name="org.eclipse.ptp.pldt.mpi.core.mpiMarkerAnnotation">
-      </type>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors.markerAnnotationSpecification">
-      <specification
-            annotationType="org.eclipse.ptp.pldt.mpi.core.mpiMarkerAnnotation"
-            icon="icons/mpi.gif" 
-            
-            presentationLayer="3"
-            label="%specification.label"
-            
-            textPreferenceKey="mpiIndication"
-            textPreferenceValue="true"
-            highlightPreferenceKey="artifactHighlighting"
-            highlightPreferenceValue="false"
-            colorPreferenceKey="artifactIndicationColor"
-            colorPreferenceValue="0,128,192"
-            verticalRulerPreferenceKey="artifactIndicationInVerticalRuler"
-            verticalRulerPreferenceValue="true"
-			showInNextPrevDropdownToolbarActionKey="showPortingInNextPrevDropdownToolbarAction"
-            showInNextPrevDropdownToolbarAction="false"
-            overviewRulerPreferenceKey="artifactIndicationInOverviewRuler"
-            overviewRulerPreferenceValue="true"
-            
-            includeOnPreferencePage="true"
-            isGoToPreviousNavigationTargetKey="isPortingGoToPreviousNavigationTarget"
-
-            isGoToNextNavigationTargetKey="isPortingRecordGoToNextNavigationTarget"
-            >
-      </specification>  
-   </extension>
-  
-   
-   <extension
-         point="org.eclipse.ui.preferencePages">
-
-     <page
-            class="org.eclipse.ptp.pldt.mpi.core.prefs.MPIPreferencePage"
-            id="org.eclipse.ptp.pldt.mpi.core.prefpage"
-            name="%page.name"
-            category="org.eclipse.ptp.pldt.common.prefs.PLDTPreferencePage"
-            />
- <!--          category="org.eclipse.ptp.ui.preferences.ptpPreferencesPage/org.eclipse.ptp.pldt.common.prefs.PLDTPreferencePage"
- -->
-   </extension>
-   
-   <extension
-         point="org.eclipse.cdt.ui.CHelpProvider">
-      <provider
-            class="org.eclipse.ptp.pldt.mpi.core.editorHelp.MpiCHelpProvider"
-            id="org.eclipse.ptp.pldt.mpi.core.editorHelp.MpiCHelpProvider"/>
-      <provider
-            class="org.eclipse.ptp.pldt.mpi.core.editorHelp.MpiCPPHelpProvider"
-            id="org.eclipse.ptp.pldt.mpi.core.editorHelp.MpiCPPHelpProvider">
-      </provider>
-   </extension>
-   <extension
-         point="org.eclipse.core.runtime.preferences">
-               <initializer
-            class="org.eclipse.ptp.pldt.mpi.core.prefs.MPIPreferenceInitializer">
-      </initializer>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            defaultHandler="org.eclipse.ptp.pldt.mpi.core.actions.RunAnalyseMPIcommandHandler"
-            id="org.eclipse.ptp.pldt.mpi.core.command2"
-            name="%command.name">
-      </command>
-   </extension>
-   <!-- these go under the dropdown menu; could come from another plugin -->
-   <extension
-         id="tempID"
-         name="%extension.name.0"
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            locationURI="menu:org.eclipse.ptp.pldt.common.toolbar.command1?after=separator1.mpi">
-         <command
-               commandId="org.eclipse.ptp.pldt.mpi.core.command2"
-               icon="icons/mpi.gif"
-               label="%command.label"
-               style="push">
-         </command>
-        
-      </menuContribution>
-   </extension>
-     <!-- Code templates -->
-   <extension point="org.eclipse.ui.editors.templates">
-   <include file="templates/mpi_templates.xml" />
-
-   </extension>
-
-</plugin>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/samples/testMPI.c b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/samples/testMPI.c
deleted file mode 100644
index 1abdcd3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/samples/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 World the original.\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.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MPIArtifactMarkingVisitor.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MPIArtifactMarkingVisitor.java
deleted file mode 100644
index 2944352..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MPIArtifactMarkingVisitor.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005 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.core;
-
-import org.eclipse.ptp.pldt.common.ArtifactMarkingVisitor;
-
-/**
- * 
- * @author tibbitts
- *
- */
-public class MPIArtifactMarkingVisitor extends ArtifactMarkingVisitor
-{
-    public MPIArtifactMarkingVisitor(String markerId)
-    {
-        super(markerId);
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/Messages.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/Messages.java
deleted file mode 100644
index 1dc5086..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/Messages.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package org.eclipse.ptp.pldt.mpi.core;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-// FIXME for 5.0 export these as more modern Messages class (in private package)
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.pldt.mpi.core.messages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private Messages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MpiArtifactManager.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MpiArtifactManager.java
deleted file mode 100644
index 43fa62e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MpiArtifactManager.java
+++ /dev/null

@@ -1,92 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005 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.core;
-
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.ptp.pldt.common.Artifact;
-
-/**
- * @author Beth Tibbitts
- * 
- * 
- */
-public class MpiArtifactManager
-{
-    static List    repository;
-    static HashMap hashMap = new HashMap(); // to be able to look up by unique ID (finding
-    static String  inputFileName;
-
-    /**
-     * Add an MPI artifact to the repository
-     * 
-     * @param pi
-     */
-    public static void addMpiArtifact(Artifact pi)
-    {
-        repository.add(pi);
-    }
-
-    /**
-     * Add an MPI artifact to the hashtable for future lookup
-     * 
-     * @param pi
-     */
-    public static void addMpiArtifactToHash(Artifact pi)
-    {
-        String id = pi.getId(); // for debugging access only
-        hashMap.put(id, pi);
-    }
-
-    /**
-     * retrieve MPI artifact by unique ID. Used for retrieving artifacts when needed from the Markers - since markers
-     * can't hold on to them
-     * 
-     * @param id
-     * @return
-     */
-    public static Artifact getMpiArtifact(String id)
-    {
-        Artifact pi = (Artifact) hashMap.get(id);
-        return pi;
-    }
-
-    public static Object[] getMpiArtifacts()
-    {
-        Object[] pis = hashMap.values().toArray();
-        return pis;
-    }
-
-    public static HashMap getMpiArtifactMap()
-    {
-        return hashMap;
-    }
-
-    /**
-     * getList - get the list of mpi artifacts
-     */
-    public static List getList()
-    {
-        return repository;
-    }
-
-    /**
-     * getInputFile - get the input file ( on which analysis is invoked )
-     * 
-     */
-    public static String getInputFile()
-    {
-        return inputFileName;
-    }
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MpiIDs.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MpiIDs.java
deleted file mode 100644
index 38073cb..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MpiIDs.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005,2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.core;
-
-/**
- * Misc. IDs for preferences, markers, etc.
- * 
- * @author tibbitts
- * 
- */
-public interface MpiIDs
-{
-    public static final String P_RUN_ANALYSIS  = "runAnalysis"; //$NON-NLS-1$
-    public static final String P_ECHO_FORCE    = "forceEcho"; //$NON-NLS-1$
-    public static final String MARKER_ERROR_ID = "org.eclipse.ptp.pldt.mpi.core.mpiErrorMarker"; //$NON-NLS-1$
-    public static final String MARKER_ID       = "org.eclipse.ptp.pldt.mpi.core.mpiMarker"; //$NON-NLS-1$
-    public static final String FILENAME        = "filename"; //$NON-NLS-1$
-    public static final String NAME            = "name"; //$NON-NLS-1$
-    public static final String DESCRIPTION     = "description"; //$NON-NLS-1$
-    public static final String ID              = "uniqueID"; //$NON-NLS-1$
-
-    // note built-in marker id too... not sure this is used,
-    // compare with IMarker.LINE_NUMBER which is probably used instead.
-    public static final String LINE            = "theLineNo"; //$NON-NLS-1$
-    public static final String NEWLINE         = "theNewLineNo"; //$NON-NLS-1$
-
-    /** Preference page name for MPI Includes field label */
-    static public final String MPI_INCLUDES    = Messages.getString("MpiIDs.MPI_INCLUDES"); //$NON-NLS-1$
-    /** Preference setting for default mpi build command */
-	public static final String MPI_BUILD_CMD = "mpiBuildCommand"; //$NON-NLS-1$
-	/** Preference setting for default c++ mpi build command */
-	public static final String MPI_CPP_BUILD_CMD = "mpiCppBuildCommand"; //$NON-NLS-1$
-	/** Preference setting for whether or not to prompt the user when MPI apis are found in other locations */
-	public static final String MPI_PROMPT_FOR_OTHER_INCLUDES="mpiPromptForOtherIncludes"; //$NON-NLS-1$
-
-    /** Marker attribute for the extra info saved for each marker/artifact */
-    public static final String CONSTRUCT_TYPE  = "constructType"; //$NON-NLS-1$
-    
-    /** id for MPI Artifact view */
-    public static final String MPI_VIEW_ID = "org.eclipse.ptp.pldt.mpi.core.views.MPITableView"; //$NON-NLS-1$
-    /** 
-     * If we recognize MPI APIs by prefix (MPI_) alone, we don't need the include file location and the hassle 
-     * that it causes for users to get it right.
-     */
-	public static final String MPI_RECOGNIZE_APIS_BY_PREFIX_ALONE = "mpiRecognizeAPIsByPrefixAlone"; //$NON-NLS-1$
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MpiPlugin.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MpiPlugin.java
deleted file mode 100644
index 4e7f2e3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/MpiPlugin.java
+++ /dev/null

@@ -1,161 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.core;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-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 MpiPlugin extends AbstractUIPlugin
-{
-    /** The shared instance */
-    private static MpiPlugin plugin;
-    /** Resource bundle */
-    private ResourceBundle   resourceBundle;
-    protected static final boolean traceOn=false;
-    
-    private static final String PLUGIN_ID = "org.eclipse.ptp.pldt.mpi.core"; //$NON-NLS-1$
-
-    /**
-     * The constructor.
-     */
-    public MpiPlugin()
-    {
-        super();
-        plugin = this;
-    }
-
-    /**
-     * This method is called upon plug-in activation
-     */
-    public void start(BundleContext context) throws Exception
-    {
-        super.start(context);
-    }
-
-    /**
-     * This method is called when the plug-in is stopped
-     */
-    public void stop(BundleContext context) throws Exception
-    {
-        super.stop(context);
-        plugin = null;
-        resourceBundle = null;
-    }
-
-    /**
-     * Returns the shared instance.
-     */
-    public static MpiPlugin getDefault()
-    {
-        return plugin;
-    }
-
-    /**
-     * Returns the string from the plugin's resource bundle, or 'key' if not found.
-     */
-    public static String getResourceString(String key)
-    {
-        ResourceBundle bundle = MpiPlugin.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("org.eclipse.ptp.pldt.mpi.core.MpiPluginResources"); //$NON-NLS-1$
-        } catch (MissingResourceException x) {
-            resourceBundle = null;
-        }
-        return resourceBundle;
-    }
-
-    /**
-     * Returns an image descriptor for the image file at the given plug-in relative path.
-     * 
-     * @param path the path
-     * @return the image descriptor
-     */
-    public static ImageDescriptor getImageDescriptor(String path)
-    {
-        return AbstractUIPlugin.imageDescriptorFromPlugin(MpiIDs.MPI_VIEW_ID, path);
-    }
-    /**
-     * so that other plugins can access the icon that represents this plugin
-     * @return
-     */
-    public ImageDescriptor getIconImageDescriptor(){
-    	ImageDescriptor id = getImageDescriptor("icons/mpi.gif"); //$NON-NLS-1$
-    	return id;
-    }
-
-    /**
-     * 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;
-    }
-    /**
-     * Returns the preference setting for MPI include paths
-     * 
-     * @return
-     */
-    public List<String> getMpiIncludeDirs()
-    {
-        String stringList = getPluginPreferences().getString(MpiIDs.MPI_INCLUDES);
-        StringTokenizer st = new StringTokenizer(stringList, File.pathSeparator + "\n\r");//$NON-NLS-1$
-        List<String> dirs = new ArrayList<String>();
-        while (st.hasMoreElements()) {
-            dirs.add(st.nextToken());
-        }
-        return dirs;
-    }
-    
-    public static String getPluginId()
-    {
-        return PLUGIN_ID;
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/actions/AnalyseMPIFortranHandler.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/actions/AnalyseMPIFortranHandler.java
deleted file mode 100644
index 6ea26d1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/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.core.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.core.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.core/src/org/eclipse/ptp/pldt/mpi/core/actions/RunAnalyseMPIcommandHandler.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/actions/RunAnalyseMPIcommandHandler.java
deleted file mode 100644
index 54a04d6..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/actions/RunAnalyseMPIcommandHandler.java
+++ /dev/null

@@ -1,120 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.core.actions;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.ast.gnu.c.GCCLanguage;
-import org.eclipse.cdt.core.dom.ast.gnu.cpp.GPPLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.model.ITranslationUnit;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.ptp.pldt.common.CommonPlugin;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.actions.RunAnalyseHandlerBase;
-import org.eclipse.ptp.pldt.common.util.ViewActivator;
-import org.eclipse.ptp.pldt.mpi.core.MPIArtifactMarkingVisitor;
-import org.eclipse.ptp.pldt.mpi.core.MpiIDs;
-import org.eclipse.ptp.pldt.mpi.core.MpiPlugin;
-import org.eclipse.ptp.pldt.mpi.core.analysis.MpiCASTVisitor;
-import org.eclipse.ptp.pldt.mpi.core.analysis.MpiCPPASTVisitor;
-
-/**
- * @author tibbitts
- *
- */
-public class RunAnalyseMPIcommandHandler extends RunAnalyseHandlerBase
-{
-	/**
-	 * Constructor for the "Run Analysis" action
-	 */
-	public RunAnalyseMPIcommandHandler() {
-		super("MPI", new MPIArtifactMarkingVisitor(MpiIDs.MARKER_ID), MpiIDs.MARKER_ID); //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns MPI analysis artifacts for file
-	 * 
-	 * @param file
-	 * @param includes
-	 *            MPI include paths
-	 * @return
-	 */
-	@Override
-	public ScanReturn doArtifactAnalysis(final ITranslationUnit tu,	final List<String> includes) {
-		final ScanReturn msr = new ScanReturn();
-		final String fileName = tu.getElementName();
-		ILanguage lang;
-		boolean allowPrefixOnlyMatch=MpiPlugin.getDefault().getPreferenceStore().getBoolean(MpiIDs.MPI_RECOGNIZE_APIS_BY_PREFIX_ALONE);
-		try {
-			lang = tu.getLanguage(); 
-            
-			//long startTime = System.currentTimeMillis();
-			IASTTranslationUnit atu = getAST(tu); // use index; was tu.getAST();
-
-			//long endTime = System.currentTimeMillis();
-			//System.out.println("RunAnalyseMPICommandHandler: time to build AST for "+tu+": "+(endTime-startTime)/1000.0+" sec");
-			String languageID=lang.getId();
-			if(languageID.equals(GCCLanguage.ID) || languageID.equals(GPPLanguage.ID)) {
-				// null IASTTranslationUnit when we're doing C/C++ means we should quit.
-				// but want to continue to see if this is a fortran file we are analyzing.
-				if(atu==null) {// this is null for Fortran file during JUnit testing.
-					System.out.println("RunAnalyseMPICommandHandler.doArtifactAnalysis(), atu is null (testing?)");
-					return msr;
-				}
-			}
-			if (languageID.equals(GCCLanguage.ID)) {// C
-				atu.accept(new MpiCASTVisitor(includes, fileName, allowPrefixOnlyMatch, msr));
-			}
-			else if (languageID.equals(GPPLanguage.ID)) { // C++
-			  atu.accept(new MpiCPPASTVisitor(includes, fileName, allowPrefixOnlyMatch, msr));
-			}
-			else {
-				// Attempt to handle Fortran
-				// Instantiate using reflection to avoid static Photran dependencies
-				try {
-					Class<?> c = Class.forName("org.eclipse.ptp.pldt.mpi.core.actions.AnalyseMPIFortranHandler");
-					Method method = c.getMethod("run", String.class, ITranslationUnit.class, String.class, ScanReturn.class);
-					method.invoke(c.newInstance(), languageID, tu, fileName, msr);
-				} catch (Exception e) {
-					System.err.println("RunAnalyseMPIcommandHandler.doArtifactAnalysis: Photran not installed");
-				}
-			}
-		} catch (CoreException e) {
-			e.printStackTrace();
-			CommonPlugin.log(IStatus.ERROR,"RunAnalyseMPICommandHandler.getAST():Error setting up visitor for project "+tu.getCProject()+" error="+e.getMessage()); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		return msr;
-	}
-
-
-	@Override
-	protected List<String> getIncludePath() {
-		return MpiPlugin.getDefault().getMpiIncludeDirs();
-	}
-    @Override
-	protected void activateArtifactView() {
-		ViewActivator.activateView(MpiIDs.MPI_VIEW_ID);
-	}
-    @Override
-	public boolean areIncludePathsNeeded() {
-    	boolean allowPrefixOnlyMatch= MpiPlugin.getDefault().getPreferenceStore().getBoolean(MpiIDs.MPI_RECOGNIZE_APIS_BY_PREFIX_ALONE);
-    	return !allowPrefixOnlyMatch;
-    }
-
-	
-	 
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/analysis/MpiCASTVisitor.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/analysis/MpiCASTVisitor.java
deleted file mode 100644
index 8c89b4f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/analysis/MpiCASTVisitor.java
+++ /dev/null

@@ -1,157 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.mpi.core.analysis;
-
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionCallExpression;
-import org.eclipse.cdt.core.dom.ast.IASTIdExpression;
-import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IBinding;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ptp.pldt.common.CommonPlugin;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.analysis.PldtAstVisitor;
-import org.eclipse.ptp.pldt.mpi.core.Messages;
-import org.eclipse.ptp.pldt.mpi.core.MpiIDs;
-import org.eclipse.ptp.pldt.mpi.core.MpiPlugin;
-
-/**
- * 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
- * 
- */
-public class MpiCASTVisitor extends PldtAstVisitor {
-	private static final String PREFIX = "MPI_"; //$NON-NLS-1$
-
-	private static/* final */boolean traceOn = false;
-
-	{
-		this.shouldVisitExpressions = true;
-		this.shouldVisitStatements = true;
-		this.shouldVisitDeclarations = true;
-		this.shouldVisitTranslationUnit = true;
-	}
-
-	@SuppressWarnings("unchecked")
-	public MpiCASTVisitor(List mpiIncludes, String fileName, boolean allowPrefixOnlyMatch, ScanReturn msr) {
-		super(mpiIncludes, fileName, allowPrefixOnlyMatch, msr);
-		ARTIFACT_CALL = Messages.getString("MpiCASTVisitor.mpiCall"); //$NON-NLS-1$
-		ARTIFACT_CONSTANT = Messages.getString("MpiCASTVisitor.mpiConstant"); //$NON-NLS-1$
-		ARTIFACT_NAME="MPI"; //$NON-NLS-1$
-
-		traceOn = CommonPlugin.getTraceOn();
-		if (traceOn)
-			System.out.println("MpiCASTVisitor.ctor: traceOn=" + traceOn); //$NON-NLS-1$
-
-	}
-
-	/**
-	 * Visit an expression node.
-	 * 
-	 * @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTExpression)
-	 */
-	public int visit(IASTExpression expression) {
-		if (expression instanceof IASTFunctionCallExpression) {
-			// in stdmake this is a CASTFunctionCallExpression but implements
-			// IASTFUnctionCallExpr, so ok
-			IASTExpression astExpr = ((IASTFunctionCallExpression) expression)
-					.getFunctionNameExpression();
-			String signature = astExpr.getRawSignature();
-			// note: getRawSig is the name BEFORE being processed by
-			// preprocessor!
-			// but it seems to be empty if it's different.
-			// IASTFunctionCallExpression
-			// fce=(IASTFunctionCallExpression)expression;
-			// IASTExpression fne=fce.getFunctionNameExpression();
-
-			// can we get post-pre-processor name here?
-			if (astExpr instanceof IASTIdExpression) {
-				IASTName tempFN = ((IASTIdExpression) astExpr).getName();
-				IBinding tempBIND = tempFN.resolveBinding();
-				String tempNAME = tempBIND.getName();
-				if (traceOn)
-					System.out
-							.println("MCAV name: " + tempNAME + " rawsig: " + signature); //$NON-NLS-1$ //$NON-NLS-2$
-				// if e.g. preprocessor substitution used, use that for function
-				// name
-				boolean preProcUsed = !signature.equals(tempNAME);
-				if (preProcUsed) {
-					signature = tempNAME;
-				}
-			}
-			if (signature.startsWith(PREFIX)) {
-				if (astExpr instanceof IASTIdExpression) {
-					IASTName funcName = ((IASTIdExpression) astExpr).getName();
-					// IBinding binding = funcName.resolveBinding();
-					// String name=binding.getName();// name ok for stdMake
-					processFuncName(funcName, astExpr);
-				}
-			}
-		} else if (expression instanceof IASTLiteralExpression) {
-			processMacroLiteral((IASTLiteralExpression) expression);
-		} else {
-			// Other possibilities? Do we care? Assume not.
-			// if(expression instanceof CASTUnaryExpression)
-			// if(expression instanceof CASTIdExpression)
-
-		}
-		return PROCESS_CONTINUE;
-	}
-
-	/**
-	 * allow dynamic adding to include path?
-	 * <br>Note: if this returns true, be certain to override getIncludesPrefID() and
-	 * getPreferenceStore() which will be needed by the implementation to do this
-	 * 
-	 * @return
-	 */
-	@Override
-	public boolean allowIncludePathAdd() {
-		boolean canAsk = getPreferenceStore().getBoolean(MpiIDs.MPI_PROMPT_FOR_OTHER_INCLUDES);
-		return canAsk;
-	}
-	/**
-	 * needs to be overridden for derived classes that need to dynamically update the pref store 
-	 * e.g. for the includes path
-	 * @return
-	 */
-	@Override
-	protected String getIncludesPrefID() {
-		return MpiIDs.MPI_INCLUDES;
-	}
-	/**
-	 * needs to be overridden for derived classes that need to dynamically update the pref store 
-	 * e.g. for the includes path
-	 * @return
-	 */
-	@Override
-	protected IPreferenceStore getPreferenceStore() {
-		return MpiPlugin.getDefault().getPreferenceStore();
-	}
-
-	/**
-	 * needs to be overridden for derived classes that need to dynamically update the pref store 
-	 * e.g. for the includes path.  This type name is used for messages, etc.
-	 * @return artifact type name such as "MPI", "OpenMP" etc.
-	 */	
-	@Override
-	protected String getTypeName() {
-		return ARTIFACT_NAME;
-	}
-
-}
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/analysis/MpiCPPASTVisitor.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/analysis/MpiCPPASTVisitor.java
deleted file mode 100644
index 5ba99e2..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/analysis/MpiCPPASTVisitor.java
+++ /dev/null

@@ -1,159 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005, 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.core.analysis;
-
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionCallExpression;
-import org.eclipse.cdt.core.dom.ast.IASTIdExpression;
-import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTFieldReference;
-import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTIdExpression;
-import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTLinkageSpecification;
-import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTUsingDirective;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.analysis.PldtAstVisitor;
-import org.eclipse.ptp.pldt.mpi.core.Messages;
-
-/**
- * This dom-walker collects artifacts (currently function calls and constants),
- * and adds markers to the source file for C++ code.
- * 
- */
-public class MpiCPPASTVisitor extends PldtAstVisitor {
-	private static final boolean traceOn = false;
-
-	private static final String PREFIX1 = "MPI_"; //$NON-NLS-1$
-
-	private static final String PREFIX2 = "MPI::"; //$NON-NLS-1$
-
-	{
-		this.shouldVisitExpressions = true;
-		this.shouldVisitStatements = true;
-		this.shouldVisitDeclarations = true;
-		this.shouldVisitTranslationUnit = true;
-	}
-
-	private boolean usingNamespaceMPI;
-
-	public MpiCPPASTVisitor(List mpiIncludes, String fileName, boolean allowPrefixOnlyMatch, ScanReturn msr) {
-		super(mpiIncludes, fileName, allowPrefixOnlyMatch, msr);
-		usingNamespaceMPI = false;
-		ARTIFACT_CALL = Messages.getString("MpiCPPASTVisitor.mpiCall"); //$NON-NLS-1$
-		ARTIFACT_CONSTANT = Messages.getString("MpiCPPASTVisitor.mpiConstant"); //$NON-NLS-1$
-	}
-
-	public int visit(IASTDeclaration declaration) {
-		if (declaration instanceof CPPASTUsingDirective) {
-			CPPASTUsingDirective cppASTUsingDirective = (CPPASTUsingDirective) declaration;
-			if ("MPI".equals(cppASTUsingDirective.getQualifiedName().getRawSignature())) { //$NON-NLS-1$
-				usingNamespaceMPI = true;
-			}
-		}
-
-		// Workaround of a CDT problem where declaration for [extern "C"...] in
-		// C++ code has null file location
-		if ((declaration instanceof CPPASTLinkageSpecification) && (declaration.getFileLocation() == null))
-			return PROCESS_CONTINUE;
-
-		if (declaration.getFileLocation() == null) {
-			if (traceOn)
-				System.out.println("MpiCPPASTVisitor.visit(decl): null decl"); //$NON-NLS-1$
-		}
-
-		return super.visit(declaration);
-	}
-
-	/**
-	 * Visit an expression node
-	 * 
-	 * @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTExpression)
-	 */
-	public int visit(IASTExpression expression) {
-
-		if (expression instanceof IASTFunctionCallExpression) {
-			IASTExpression astExpr = ((IASTFunctionCallExpression) expression).getFunctionNameExpression();
-			String signature = astExpr.getRawSignature();
-			// note: getRawSig is BEFORE processed by preprocessor!
-
-			// System.out.println("func signature=" + signature);
-			// since all MPI symbols start with a certain prefix,
-			// we'll do a quick test to cull the search
-			if (usingNamespaceMPI || signature.startsWith(PREFIX1) || signature.startsWith(PREFIX2)) {
-				IASTName funcName = null;
-				if (astExpr instanceof CPPASTFieldReference) {
-					// This is method call through C++ member functions (e.g.
-					// MPI::COMM_WORLD.Get_size)
-					CPPASTFieldReference cppFieldReference = (CPPASTFieldReference) astExpr;
-					funcName = cppFieldReference.getFieldName();
-
-				} else if (astExpr instanceof IASTIdExpression) {
-					// This is C-style direct method call (e.g. MPI_Init, or
-					// MPI::Init)
-
-					// IASTName tempFN = ((IASTIdExpression) astExpr).getName();
-					// IBinding tempBIND = tempFN.resolveBinding();
-					// String tempNAME=tempBIND.getName(); //
-					// signature="MPI::Init" but this is "Init"
-
-					funcName = ((IASTIdExpression) astExpr).getName();
-					// String funcNameString=funcName.toString();//MPI::Init
-				}
-				processFuncName(funcName, astExpr);
-			}
-		} else if ((expression instanceof CPPASTIdExpression)
-				&& !(expression.getParent() instanceof IASTFunctionCallExpression)) { // this
-			// excludes a CPPASTIdExpression acting as method call (e.g.
-			// MPI_Init)
-			processIdExprAsLiteral((CPPASTIdExpression) expression);
-		} else if (expression instanceof IASTLiteralExpression) {
-			processMacroLiteral((IASTLiteralExpression) expression);
-		}
-
-		return PROCESS_CONTINUE;
-	}
-	@Override
-	protected String chooseName(String bindingName, String rawSignature){
-		String name=bindingName;
-		if(bindingName.length()==0) {
-			name=rawSignature;
-		}
-		if(rawSignature.startsWith(PREFIX2)){
-			name=rawSignature;
-		}
-		return name;
-	}
-	/**
-	 * Don't allow dynamic include path adding for C++ -- too complicated to know if something is an MPI artifact.
-	 * Consider implementing this later.
-	 */
-	@Override
-	 public boolean allowIncludePathAdd() {
-	    return false;
-	  }
-	@Override
-  public boolean addIncludePath( IPath path,  String name, boolean dontAskAgain) {
-	  return false;
-	}
-	@Override
-	public boolean matchesPrefix(String name) {
-		boolean result=false;
-		if(name.startsWith(PREFIX1)||name.startsWith(PREFIX2)) {
-			result=true;
-		}
-		return result;
-	}
-}
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/analysis/MpiFortranASTVisitor.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/analysis/MpiFortranASTVisitor.java
deleted file mode 100644
index 0220b7a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/analysis/MpiFortranASTVisitor.java
+++ /dev/null

@@ -1,70 +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.core.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$
-
-	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.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MPIDocXMLParser.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MPIDocXMLParser.java
deleted file mode 100644
index 7d43126..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MPIDocXMLParser.java
+++ /dev/null

@@ -1,108 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005, 2007 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.core.editorHelp;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.ptp.pldt.common.editorHelp.FunctionPrototypeSummaryImpl;
-import org.eclipse.ptp.pldt.common.editorHelp.FunctionSummaryImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-/**
- */
-public class MPIDocXMLParser {
-	
-	public static void main(String [] args)
-	{
-		File file = new File(args[0]);
-		try {
-			List<FunctionSummaryImpl> functions = parseDOM(new FileInputStream(file), "cname");//$NON-NLS-1$
-			System.out.println("num of functions gathered: "+functions.size());//$NON-NLS-1$
-            System.out.println("first function summary:");//$NON-NLS-1$
-            System.out.println((FunctionSummaryImpl)(functions.iterator().next()));
-		} catch (FileNotFoundException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	/**
-	 * 
-	 * @param xmlIn input stream for XML file
-	 * @param cOrCppName the name of the 'name' node: "cname" for C, "cppName" for C++
-	 * @return
-	 */
-	public static List<FunctionSummaryImpl> parseDOM(InputStream xmlIn, String cOrCppName) {
-		List<FunctionSummaryImpl> mpiFuncList = new ArrayList<FunctionSummaryImpl>();
-		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-		Document document = null;
-		try {
-			DocumentBuilder builder = factory.newDocumentBuilder();
-			if (xmlIn != null)
-				document = builder.parse(xmlIn);
-		} catch (ParserConfigurationException e) {
-			e.printStackTrace();
-		} catch (SAXException e) {
-			e.printStackTrace();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-
-		if (document != null) {
-			NodeList functionList = document.getElementsByTagName("function");//$NON-NLS-1$
-			for (int i = 0; i < functionList.getLength(); i++) {
-				Node func = functionList.item(i);
-				NodeList child = func.getChildNodes();
-				String cname = null;
-				String desc = null;
-				FunctionPrototypeSummaryImpl prototypeSummary = null;
-				for (int j = 0; j < child.getLength(); j++) {
-					Node sub = child.item(j);
-					if (sub.getNodeName().equals(cOrCppName)) {
- 						cname = sub.getTextContent(); // java 5 
-//                        cname = sub.getFirstChild().getNodeValue();
-					} else if (sub.getNodeName().equals("description")) {//$NON-NLS-1$
-						desc = sub.getTextContent(); // java 5
-//                     desc = sub.getFirstChild().getNodeValue();
-					} else if (sub.getNodeName().equals("prototype")) {//$NON-NLS-1$
-						NodeList protoSub = sub.getChildNodes();
-                        // java 5
-						prototypeSummary = new FunctionPrototypeSummaryImpl(
-								protoSub.item(3).getTextContent(), protoSub
-										.item(1).getTextContent(), protoSub
-										.item(5).getTextContent());
-//                        prototypeSummary = new FunctionPrototypeSummaryImpl(
-//                              protoSub.item(3).getFirstChild().getNodeValue(), protoSub
-//                                      .item(1).getFirstChild().getNodeValue(), protoSub
-//                                      .item(5).getFirstChild().getNodeValue());
-					}
-				}
-				FunctionSummaryImpl functionSummary = new FunctionSummaryImpl(cname,
-						"", desc, prototypeSummary, null); //$NON-NLS-1$
-				mpiFuncList.add(functionSummary);
-			}
-		}
-		return mpiFuncList;
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCHelpBook.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCHelpBook.java
deleted file mode 100644
index 22b6a76..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCHelpBook.java
+++ /dev/null

@@ -1,64 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.core.editorHelp;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ptp.pldt.common.editorHelp.CHelpBookImpl;
-import org.eclipse.ptp.pldt.common.editorHelp.FunctionSummaryImpl;
-import org.eclipse.ptp.pldt.mpi.core.Messages;
-import org.eclipse.ptp.pldt.mpi.core.MpiPlugin;
-import org.osgi.framework.Bundle;
-
-/**
- * Help book for C MPI functions
- * @author tibbitts
- *
- */
-public class MpiCHelpBook extends CHelpBookImpl {
-	private static final String TITLE = Messages.getString("MpiCHelpBook_MPI_C_HELP_BOOK_TITLE"); //$NON-NLS-1$
-    
-	/**
-	 * builds the list of function summaries by parsing an XML file
-	 */
-	public MpiCHelpBook() {
-		super(MpiPlugin.getPluginId());
-		// populate func map
-		Bundle bundle = Platform.getBundle(MpiPlugin.getPluginId());
-		Path path = new Path("mpiref.xml"); //$NON-NLS-1$
-		////
-		//URL fileURL = Platform.find(bundle, path); // old
-		URL fileURL = FileLocator.find(bundle, path, null);
-		InputStream xmlIn = null;
-		try {
-			xmlIn = fileURL.openStream();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-
-		List<FunctionSummaryImpl> mpiFuncList = MPIDocXMLParser.parseDOM(xmlIn, "cname"); //$NON-NLS-1$
-		for (Iterator<FunctionSummaryImpl> it = mpiFuncList.iterator(); it.hasNext();) {
-			FunctionSummaryImpl functionSummary = it.next();
-			funcName2FuncInfo.put(functionSummary.getName(), functionSummary);
-		}
-		
-		// set title
-		setTitle(TITLE);
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCHelpProvider.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCHelpProvider.java
deleted file mode 100644
index 8e8fb7c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCHelpProvider.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005 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.core.editorHelp;
-
-import org.eclipse.ptp.pldt.common.editorHelp.CHelpProviderImpl;
-
-
-/**
- * 
- * Provides help information for MPI APIs for C (F1, hover, content assist, etc.)
- */
-public class MpiCHelpProvider extends CHelpProviderImpl
-{    
-	/**
-	 * Default ctor required, or else for some reason this
-	 * class never gets instantiated.
-	 *
-	 */
-	public MpiCHelpProvider() {
-		// default ctor for testing that it gets called
-	    //   System.out.println("MpiCHelpProvider ctor()...");
-
-	}
-    public void initialize()
-    {
-        helpBook = new MpiCHelpBook();
-        //System.out.println("MpiCHelpProvider initialize()...");
-    }
-}
-
- 
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCPPHelpBook.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCPPHelpBook.java
deleted file mode 100644
index e9faccc..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCPPHelpBook.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005 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.core.editorHelp;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.cdt.ui.ICHelpBook;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ptp.pldt.common.editorHelp.CHelpBookImpl;
-import org.eclipse.ptp.pldt.common.editorHelp.FunctionSummaryImpl;
-import org.eclipse.ptp.pldt.mpi.core.Messages;
-import org.eclipse.ptp.pldt.mpi.core.MpiPlugin;
-import org.osgi.framework.Bundle;
-
-/**
- * Help book for C++ MPI functions
- * @author tibbitts
- *
- */
-public class MpiCPPHelpBook extends CHelpBookImpl
-{
-    private static final String TITLE = Messages.getString("MpiCPPHelpBook_MPI_CPP_HELP_BOOK_TITLE"); //$NON-NLS-1$
-    private static final boolean traceOn=false;
-
-    public MpiCPPHelpBook()
-    {
-		super(MpiPlugin.getPluginId());
-		if(traceOn)System.out.println("MPI CPP help book ctor()..."); //$NON-NLS-1$
-		// populate func map
-		Bundle bundle = Platform.getBundle(MpiPlugin.getPluginId());
-		Path path = new Path("mpiref.xml"); //$NON-NLS-1$
-
-		URL fileURL = FileLocator.find(bundle, path, null);
-		InputStream xmlIn = null;
-		try {
-			xmlIn = fileURL.openStream();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-
-		List<FunctionSummaryImpl> mpiFuncList = MPIDocXMLParser.parseDOM(xmlIn, "cppname"); //$NON-NLS-1$
-		int temp=0;
-		for (Iterator<FunctionSummaryImpl> it = mpiFuncList.iterator(); it.hasNext();) {
-			FunctionSummaryImpl functionSummary = it.next();
-			if(traceOn)if(2>temp++)System.out.println("  "+functionSummary.getName()+"-"+functionSummary.getDescription()); //$NON-NLS-1$ //$NON-NLS-2$
-			funcName2FuncInfo.put(functionSummary.getName(), functionSummary);
-		};
-    	// set title
-    	setTitle(TITLE);
-
-    }
-    
-    public int getCHelpType()
-    {
-        return ICHelpBook.HELP_TYPE_CPP;
-    }
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCPPHelpProvider.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCPPHelpProvider.java
deleted file mode 100644
index 48d5d27..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/editorHelp/MpiCPPHelpProvider.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005 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.core.editorHelp;
-
-import org.eclipse.ptp.pldt.common.editorHelp.CHelpProviderImpl;
-
-
-/**
- * 
- * Provides help information for MPI APIs for C++(F1, hover, content assist, etc.)
- */
-public class MpiCPPHelpProvider extends CHelpProviderImpl
-{    
-	/**
-	 * Default ctor required, or else for some reason this
-	 * class never gets instantiated.
-	 *
-	 */
-	public MpiCPPHelpProvider() {
-		// default ctor for testing that it gets called
-	    //   System.out.println("MpiCHelpProvider ctor()...");
-
-	}
-    public void initialize()
-    {
-        helpBook = new MpiCPPHelpBook();
-        //System.out.println("MpiCHelpProvider initialize()...");
-    }
-}
-
- 
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/messages.properties b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/messages.properties
deleted file mode 100644
index cb2a89b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/messages.properties
+++ /dev/null

@@ -1,16 +0,0 @@
-MpiCASTVisitor.mpiCall=MPI Call
-MpiCASTVisitor.mpiConstant=MPI Constant
-MpiCHelpBook_MPI_C_HELP_BOOK_TITLE=MPI C Help Book
-MpiCPPASTVisitor.mpiCall=MPI Call
-MpiCPPASTVisitor.mpiConstant=MPI Constant
-MpiCPPHelpBook_MPI_CPP_HELP_BOOK_TITLE=MPI C++ Help Book
-MpiIDs.MPI_INCLUDES=MPI Includes
-MPIPreferencePage.mpiIncludePaths=MPI include paths:
-MPIPreferencePage.pleaseChooseAdirectory=Please choose a directory for MPI includes:
-MPIPreferencePage.mpiBuildCommand=MPI build command (C):
-MPIPreferencePage.mpiCppBuildCommand=MPI build command (C++):
-MPIPreferencePage.promptToIncludeOtherLocations=Prompt to include MPI APIs found in other locations (C only)?
-MPIPreferencePage.recognizeAPISByPrefixAlone=Recognize MPI Artifacts by prefix (MPI_) alone?
-MPITableView_ARTIFACT=Artifact
-MPITableView_ARTIFACTS=Artifacts
-MPITableView_CONSTRUCT=Construct

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/prefs/MPIPreferenceInitializer.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/prefs/MPIPreferenceInitializer.java
deleted file mode 100644
index 35882de..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/prefs/MPIPreferenceInitializer.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/package org.eclipse.ptp.pldt.mpi.core.prefs;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ptp.pldt.mpi.core.MpiIDs;
-import org.eclipse.ptp.pldt.mpi.core.MpiPlugin;
-
-/**
- * Class used to initialize default preference values.
- * @author Beth Tibbitts
- */
-public class MPIPreferenceInitializer extends AbstractPreferenceInitializer {
-
-	/**
-	 * Initialize default MPI preferences
-	 */
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = MpiPlugin.getDefault()
-				.getPreferenceStore();
-    	store.setDefault(MpiIDs.MPI_BUILD_CMD, "mpicc");//$NON-NLS-1$
-    	store.setDefault(MpiIDs.MPI_CPP_BUILD_CMD, "mpic++");//$NON-NLS-1$
-    	store.setDefault(MpiIDs.MPI_PROMPT_FOR_OTHER_INCLUDES, true);
-    	store.setDefault(MpiIDs.MPI_RECOGNIZE_APIS_BY_PREFIX_ALONE, true);
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/prefs/MPIPreferencePage.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/prefs/MPIPreferencePage.java
deleted file mode 100644
index 6f61984..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/prefs/MPIPreferencePage.java
+++ /dev/null

@@ -1,112 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.mpi.core.prefs;
-
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PathEditor;
-import org.eclipse.jface.preference.StringFieldEditor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.pldt.mpi.core.Messages;
-import org.eclipse.ptp.pldt.mpi.core.MpiIDs;
-import org.eclipse.ptp.pldt.mpi.core.MpiPlugin;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-/**
- * Preference page for MPI settings
- * <br>
- * Note that "Prompt to include MPI APIs found in other locations" is only applicable
- * to C code, not C++: because C++ MPI APIs are not as easily recognizable - when
- * discovered via CDT AST, they sometimes do not have the "MPI" prefix.
- * C++ MPI APIs include e.g. MPI_Bcast, MPI::Init, and Get_size (coded as "MPI::COMM_WORLD.Get_size()")
- * thus we don't cull by excluding all APIs for C++ code that don't start with a prefix.
- * That said, since we do this, we end up looking at all variables and functions including
- * those found only in user code, e.g. argc and argv.  If we asked the user about all of these,
- * it would be annoying and too slow.
- * <p>This should probably be re-evaluated in the future.
- * An alternative might be a "don't ask me again during this run" checkbox
- * on the popup asking to add the API, that appears during execution.
- * That would remove the annoying part; but performance may still suffer from this extra test?
- * <p>Crude workaround: Run MPI analysis at least once on plain C code, to assure it's finding the
- * header files in the same place that are specified here in the preferences.
- * 
- */
-
-public class MPIPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage
-{
-    private static final String MPI_INCLUDES_PREFERENCE_LABEL  = Messages.getString("MPIPreferencePage.mpiIncludePaths"); //$NON-NLS-1$
-    private static final String MPI_INCLUDES_PREFERENCE_BROWSE = Messages.getString("MPIPreferencePage.pleaseChooseAdirectory"); //$NON-NLS-1$
-    private static final String MPI_BUILD_COMMAND_LABEL = Messages.getString("MPIPreferencePage.mpiBuildCommand"); //$NON-NLS-1$
-    private static final String MPI_CPP_BUILD_COMMAND_LABEL = Messages.getString("MPIPreferencePage.mpiCppBuildCommand"); //$NON-NLS-1$
-    private static final String PROMPT_FOR_OTHERS_LABEL=Messages.getString("MPIPreferencePage.promptToIncludeOtherLocations"); //$NON-NLS-1$
-    private static final String MPI_RECOGNIZE_APIS_BY_PREFIX_ALONE_LABEL = Messages.getString("MPIPreferencePage.recognizeAPISByPrefixAlone"); //$NON-NLS-1$
-
-    public MPIPreferencePage()
-    {
-        super(FLAT);
-        initPreferenceStore();
-    }
-
-    public MPIPreferencePage(int style)
-    {
-        super(style);
-        initPreferenceStore();
-    }
-
-    public MPIPreferencePage(String title, ImageDescriptor image, int style)
-    {
-        super(title, image, style);
-        initPreferenceStore();
-    }
-
-    public MPIPreferencePage(String title, int style)
-    {
-        super(title, style);
-        initPreferenceStore();
-    }
-
-    /**
-     * Init preference store and set the preference store for the preference page
-     */
-    private void initPreferenceStore()
-    {
-        IPreferenceStore store = MpiPlugin.getDefault().getPreferenceStore();
-        setPreferenceStore(store);
-    }
-
-    public void init(IWorkbench workbench)
-    {
-    }
-
-    protected void createFieldEditors()
-    {
-        BooleanFieldEditor bPrefix = new BooleanFieldEditor(MpiIDs.MPI_RECOGNIZE_APIS_BY_PREFIX_ALONE, MPI_RECOGNIZE_APIS_BY_PREFIX_ALONE_LABEL, getFieldEditorParent());
-        addField(bPrefix);
-        
-        PathEditor pathEditor = new PathEditor(MpiIDs.MPI_INCLUDES, MPI_INCLUDES_PREFERENCE_LABEL,
-                MPI_INCLUDES_PREFERENCE_BROWSE, getFieldEditorParent());
-        addField(pathEditor);
-        
-        StringFieldEditor sed = new StringFieldEditor(MpiIDs.MPI_BUILD_CMD, MPI_BUILD_COMMAND_LABEL,getFieldEditorParent());
-        addField(sed);
-        
-        StringFieldEditor sedCpp = new StringFieldEditor(MpiIDs.MPI_CPP_BUILD_CMD, MPI_CPP_BUILD_COMMAND_LABEL,getFieldEditorParent());
-        addField(sedCpp);
-        
-        BooleanFieldEditor bed = new BooleanFieldEditor(MpiIDs.MPI_PROMPT_FOR_OTHER_INCLUDES, PROMPT_FOR_OTHERS_LABEL, getFieldEditorParent());
-        addField(bed);
-        
-
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/views/MPITableView.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/views/MPITableView.java
deleted file mode 100644
index 806ae6f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/src/org/eclipse/ptp/pldt/mpi/core/views/MPITableView.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package org.eclipse.ptp.pldt.mpi.core.views;
-
-import org.eclipse.ptp.pldt.common.views.SimpleTableMarkerView;
-import org.eclipse.ptp.pldt.mpi.core.Messages;
-import org.eclipse.ptp.pldt.mpi.core.MpiIDs;
-import org.eclipse.ptp.pldt.mpi.core.MpiPlugin;
-
-/**
- * An MPI artifact view based on SimpleTableView <br>
- * Note that the ID must be unique.
- * <p>
- * If you need to read icon images, etc. from the plug-in, be sure to pass in an
- * actual Plugin class instance for first arg
- */
-public class MPITableView extends SimpleTableMarkerView {
-	public MPITableView() {
-
-		super(MpiPlugin.getDefault(), Messages.getString("MPITableView_ARTIFACT"), Messages.getString("MPITableView_ARTIFACTS"), //$NON-NLS-1$ //$NON-NLS-2$
-				Messages.getString("MPITableView_CONSTRUCT"), MpiIDs.MARKER_ID); //$NON-NLS-1$
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/templates/mpi_templates.xml b/tools/pldt/org.eclipse.ptp.pldt.mpi.core/templates/mpi_templates.xml
deleted file mode 100644
index 0eb2bf9..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.core/templates/mpi_templates.xml
+++ /dev/null

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates>
-<template name="mpiif" 
-          id="org.eclipse.ptp.pldt.mpi.templates.c.mpiif"
-          autoinsert="true" context="org.eclipse.cdt.ui.text.templates.c" deleted="false" 
-          description="MPI_Init and Finalize" enabled="true" >
-MPI_Init(&amp;argc, &amp;argv);
-
-MPI_Finalize();
-</template>
-<template name="mpisr"
-    id="org.eclipse.ptp.pldt.mpi.templates.c.mpisr"
-	autoinsert="true" context="org.eclipse.cdt.ui.text.templates.c" deleted="false" 
-	description="MPI Send Receive" enabled="true" >
-MPI_Comm_rank(${MPI_COMM_WORLD}, &amp;${rank}); 
-MPI_Comm_size(${MPI_COMM_WORLD}, &amp;${p}); 	
-
-if (${rank} == 0){ // the master task
-		${cursor}printf("Hello From process 0: Num processes: %d\n",${p});
-	    for (${source} = 1; ${source} &lt; p; ${source}++) {
-		    MPI_Recv(${message}, 100, ${MPI_CHAR}, ${source}, ${tag},
-		          ${MPI_COMM_WORLD}, &amp;status);
-		    printf("%s\n",${message});
-	    }
-	}
-	else{  // worker tasks
-		/* create message */
-			sprintf(${message}, "Hello from process %d!", ${rank});
-			dest = 0;
-			/* use strlen+1 so that '\0' get transmitted */
-			MPI_Send(${message}, strlen(${message})+1, ${MPI_CHAR},
-			   dest, ${tag}, ${MPI_COMM_WORLD});
-	}</template></templates>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/.classpath b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/.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.analysis/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/.cvsignore
deleted file mode 100644
index 47e3103..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-@dot

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/.project b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/.project
deleted file mode 100644
index 4f56a0a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.openmp.analysis</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.analysis/.settings/org.eclipse.jdt.core.prefs b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1accd56..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,8 +0,0 @@
-#Fri Apr 16 12:51:40 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.analysis/META-INF/MANIFEST.MF b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/META-INF/MANIFEST.MF
deleted file mode 100644
index d7fc9ab..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.pldt.openmp.analysis; singleton:=true
-Bundle-Version: 4.0.0.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Export-Package: org.eclipse.ptp.pldt.openmp.analysis,
- org.eclipse.ptp.pldt.openmp.analysis.PAST,
- org.eclipse.ptp.pldt.openmp.analysis.dictionary,
- org.eclipse.ptp.pldt.openmp.analysis.ompcfg,
- org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory,
- org.eclipse.ptp.pldt.openmp.analysis.parser,
- org.eclipse.ptp.pldt.openmp.analysis.textview
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.cdt.core,
- org.eclipse.ui.workbench,
- org.eclipse.jface,
- org.eclipse.cdt.ui,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.editors,
- org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.ptp.pldt.common
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/about.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/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.analysis/build.properties b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/build.properties
deleted file mode 100644
index a69103f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/build.properties
+++ /dev/null

@@ -1,8 +0,0 @@
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               plugin.properties,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/plugin.properties b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/plugin.properties
deleted file mode 100644
index bb39b55..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/plugin.properties
+++ /dev/null

@@ -1,16 +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 Parallel Language Development Tools OpenMP Analysis
-pluginProvider=Eclipse.org
-
-action.label = Show Concurrency
-extension.name = openMPConcurrencyMarker
-specification.label = Concurrency Marker
-specification.label.0 = NonConcurrency Marker
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/plugin.xml b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/plugin.xml
deleted file mode 100644
index 703b5a4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/plugin.xml
+++ /dev/null

@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-     <extension
-         point="org.eclipse.ui.popupMenus">
-      <viewerContribution
-            id="org.eclipse.ptp.pldt.openmp.analysis.CEditorContribution"
-            targetID="#CEditorContext">
-         <action
-               class="org.eclipse.ptp.pldt.openmp.analysis.textview.ShowConcurrencyAction"
-               id="org.eclipse.ptp.pldt.openmp.analysis.showConcurrency"
-               label="%action.label"
-               menubarPath="additions"/>
-      </viewerContribution>
-   </extension>
-   <extension
-         id="openMPConcurrencyMarker"
-         name="%extension.name"
-         point="org.eclipse.ui.editors.markerAnnotationSpecification">
-      <specification
-            annotationType="org.eclipse.ptp.pldt.openmp.analysis.concurrency"
-            colorPreferenceKey="concurrencyIndicationColor"
-            colorPreferenceValue="250,230,110"
-            contributesToHeader="false"
-            highlightPreferenceKey="concurrencyHighlighting"
-            highlightPreferenceValue="true"
-            includeOnPreferencePage="true"
-            isGoToNextNavigationTarget="false"
-            isGoToNextNavigationTargetKey="isConcurrencyRecordGoToNextNavigationTarget"
-            label="%specification.label"
-            overviewRulerPreferenceKey="concurrencyIndicationInOverviewRuler"
-            overviewRulerPreferenceValue="false"
-            presentationLayer="5"
-            showInNextPrevDropdownToolbarAction="false"
-            showInNextPrevDropdownToolbarActionKey="showConcurrencyInNextPrevDropdownToolbarAction"
-            textPreferenceKey="concurrencyIndication"
-            textPreferenceValue="true"
-            verticalRulerPreferenceKey="concurrencyIndicationInVerticalRuler"
-            verticalRulerPreferenceValue="false"/>
-      <specification
-            annotationType="org.eclipse.ptp.pldt.openmp.analysis.nonconcurrency"
-            colorPreferenceKey="nonConcurrencyIndicationColor"
-            colorPreferenceValue="250,150,140"
-            contributesToHeader="false"
-            highlightPreferenceKey="nonConcurrencyHighlighting"
-            highlightPreferenceValue="true"
-            includeOnPreferencePage="true"
-            isGoToNextNavigationTarget="false"
-            label="%specification.label.0"
-            overviewRulerPreferenceKey="nonConcurrencyIndicationInOverviewRuler"
-            overviewRulerPreferenceValue="false"
-            presentationLayer="5"
-            showInNextPrevDropdownToolbarAction="false"
-            textPreferenceKey="nonConcurrencyIndication"
-            textPreferenceValue="true"
-            verticalRulerPreferenceKey="nonConcurrencyIndicationInVerticalRuler"
-            verticalRulerPreferenceValue="false"/>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors.annotationTypes">
-      <type
-            markerType="org.eclipse.core.resources.problemmarker"
-            name="org.eclipse.ptp.pldt.openmp.analysis.concurrency"/>
-      <type
-            markerType="org.eclipse.core.resources.problemmarker"
-            name="org.eclipse.ptp.pldt.openmp.analysis.nonconcurrency"/>
-   </extension>
-
-</plugin>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPAnalysisException.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPAnalysisException.java
deleted file mode 100644
index 1b2ff84..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPAnalysisException.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.openmp.analysis;
-/**
- * @author pazel
- */
-public class OpenMPAnalysisException extends Exception 
-{
-    public OpenMPAnalysisException(String text)
-    {
-    	super(text);
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPAnalysisManager.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPAnalysisManager.java
deleted file mode 100644
index ff3b71b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPAnalysisManager.java
+++ /dev/null

@@ -1,509 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006,2007 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.analysis;
-
-import java.util.Set;
-import java.util.Stack;
-
-import org.eclipse.cdt.core.dom.CDOM;
-import org.eclipse.cdt.core.dom.IASTServiceProvider;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorStatement;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.ptp.pldt.common.util.Utility;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTElif;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTElse;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTEndif;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTFactory;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTIf;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTIfdef;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTIfndef;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTNode;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTOMPFactory;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTOMPPragma;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTPragma;
-import org.eclipse.ptp.pldt.openmp.analysis.dictionary.Dictionary;
-import org.eclipse.ptp.pldt.openmp.analysis.dictionary.DictionaryFactory;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory.FileConcurrencyAnalysis;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory.FileStatementMap;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory.FunctionConcurrencyAnalysis;
-
-/**
- * @author pazel
- */
-public class OpenMPAnalysisManager 
-{
-	protected IASTTranslationUnit         astTransUnit_ = null;
-	protected IFile                       iFile_        = null;
-	protected PASTNode []                 past_         = null;
-    protected PASTOMPPragma []            ompPragmas_   = null; 
-    
-    protected FileConcurrencyAnalysis     fileAnalysis_ = null;
-    protected FunctionConcurrencyAnalysis   [] analyses_     = null;
-    
-    protected FileStatementMap            fileMap_      = null;
-	private static final boolean          traceOn       = false;
-    
-    protected Dictionary                  dictionary_   = null;
-    protected OpenMPErrorManager          errorManager_ = new OpenMPErrorManager();
-    
-        protected static OpenMPAnalysisManager   currentManager_ = null;
-    
-
-    /**
-     * Constructor called by eclipse
-     * @param file
-     * @throws OpenMPAnalysisException
-     */
-	public OpenMPAnalysisManager(final IFile iFile) throws OpenMPAnalysisException
-	{
-		try {
-	       astTransUnit_ = CDOM.getInstance().getASTService().getTranslationUnit(iFile, 
-			   CDOM.getInstance().getCodeReaderFactory(CDOM.PARSE_SAVED_RESOURCES));
-		}
-		catch(IASTServiceProvider.UnsupportedDialectException e) {
-		  throw new OpenMPAnalysisException(e.toString());	
-		}
-		iFile_ = iFile;
-        init();
-        
-        currentManager_ = this;
-    }
-    
-    /**
-     * Constructor used by testing mechanism
-     * @param astTransUnit
-     */
-    public OpenMPAnalysisManager(IASTTranslationUnit astTransUnit, IFile iFile)
-    {
-        astTransUnit_ = astTransUnit;
-        iFile_    = iFile;
-        init();
-        currentManager_ = this;
-    }
-    
-    /**
-     * Get the last analysis manager built
-     * @return OpenMPAnalysisManager
-     */
-    public static OpenMPAnalysisManager getCurrentManager()
-    {
-        return currentManager_;
-    }
-    
-    /**
-     * main logic invoked by both constructors
-     *
-     */
-    private void init()
-    {
-        // Note: throughout all this, it is best to use the same AST instance, i.e.
-        //       don't re-gen it, as references to nodes may be made by various components
-        //       that should hold up under equality.
-        buildPreprocessorAST();
-        
-        buildDictionary();
-        
-        buildOMPPragmas();
-        
-        buildOMPConcurrencyAnalysis();
-        
-        buildFileMap();
-        
-        //buildDomoCDT();
-    }
-	
-    /**
-     * Build all the nodes, compute which compiled
-     *
-     */
-	private void buildPreprocessorAST()
-	{
-        IASTPreprocessorStatement[] plist = astTransUnit_.getAllPreprocessorStatements();
-        
-        past_ = new PASTNode[plist.length];
-        
-        for(int i=0; i<plist.length; i++) 
-          past_[i] = PASTFactory.PASTFactoryMake(plist[i]);	
-        
-        // Set the compiled flags to show live and dead preprocessor statements
-        computeCompiled();
-        
-	}
-    
-    /**
-     * Build the "variable" dictionary
-     *
-     */
-    private void buildDictionary()
-    {
-        dictionary_ = DictionaryFactory.buildDictionary(astTransUnit_);
-    }
-    
-//    private void buildDomoCDT()
-//    {
-//        CDTTranslateToCAst ctrans = new CDTAST2CAstTranslator(new IASTNodeFactory_c());
-//        CAstEntity entity = ctrans.translate(astTransUnit_);
-//
-//        PrintWriter printWriter= new PrintWriter(System.out);
-//
-//        CAstPrinter.printTo(entity, printWriter);
-//        printWriter.flush();
-//
-//    }
-    
-    /**
-     * Build the OMP style pragmas
-     *
-     */
-    private void buildOMPPragmas()
-    {
-        int        pCount   = 0;
-        IDocument  pragmaDoc = null;
-        String     filename  = "";
-        
-        for(int i=0; i<past_.length; i++) {
-           if (past_[i] instanceof PASTPragma) {
-               PASTPragma pragma = (PASTPragma)past_[i];
-               //
-               // For each of these, get the content
-               //
-               String newFileName = ((PASTPragma)past_[i]).getContainingFilename();
-               if (!filename.equals(newFileName)) {
-                   filename = newFileName;
-                   pragmaDoc = Utility.getDocument(filename);
-               }
-               if (pragmaDoc!=null) {
-                   try {
-                     String content = pragmaDoc.get(pragma.getLocalOffset(), pragma.getLength());
-                     pragma.setContent(content);
-                   }
-                   catch(Exception e) {}
-               }
-               
-               past_[i] = PASTOMPFactory.makePASTOMP((PASTPragma)past_[i], astTransUnit_, dictionary_);
-               // if successful, would be an omp
-               if (past_[i] instanceof PASTOMPPragma)
-                 pCount++;
-           }
-        }
-        
-        // build the pragma list
-        int  index = 0;
-        ompPragmas_ = new PASTOMPPragma[pCount];
-        for(int i=0; i<past_.length; i++) {
-            if (past_[i] instanceof PASTOMPPragma) 
-                ompPragmas_[index++] = (PASTOMPPragma)past_[i];
-        }
-        
-        if(traceOn)printPASTResults();
-    }
-    
-    /**
-     * Build concurrency analysis
-     *
-     */
-    private void buildOMPConcurrencyAnalysis()
-    {
-        fileAnalysis_ = new FileConcurrencyAnalysis(astTransUnit_,
-                                                    iFile_,
-                                                    getOMPPragmas());
-        /*DefVisitor dv = new DefVisitor(astTransUnit_, iFile_, getOMPPragmas());
-        analyses_ = dv.buildAnalyses();
-        
-        // build the phase analysis
-        for(int i=0; i<analyses_.length; i++) {
-            FunctionConcurrencyAnalysis oca = analyses_[i];
-            oca.doPhaseAnalysis();
-            if (traceOn) oca.printAnalysis(System.out);
-        }*/
-    }
-
-    /**
-     * Build the location-->stmt/expr map
-     *
-     */
-    protected void buildFileMap()
-    {
-        // Note - important that we use SAME AST for all analysis and lookup
-        fileMap_ = new FileStatementMap(astTransUnit_); 
-        fileMap_.buildMap();
-    }
-    
-    /**
-     * Get the pragma AST tree
-     * @return PASTNode []
-     */
-    public PASTNode [] getPAST()
-    {
-        return past_;
-    }
-    
-    /**
-     * Return a list of PASTOMPPragmas
-     * @return
-     */
-    public PASTOMPPragma [] getOMPPragmas()
-    {
-        return ompPragmas_;
-    }
-    
-    /**
-     * Return IASTTranslationUnit
-     * @return IASTTranslationUnit
-     */
-    public IASTTranslationUnit getTU()
-    {
-        return astTransUnit_;
-    }
-    
-    /**
-     * Accessor to the file map for analyzed file
-     * @return FileStatementMap
-     */
-    public FileStatementMap getFileMap()
-    {
-        return fileMap_;
-    }
-    
-    /**
-     * Get the analysis for each function
-     * @return FunctionConcurrencyAnalysis []
-     */
-    public FunctionConcurrencyAnalysis [] getAnalyses() 
-    { return analyses_; }
-    
-    
-    /**
-     * Get all nodes concurrent to given node
-     * @param node - IASTNode
-     * @return Set
-     */
-    public Set getNodesConcurrentTo(IASTNode node)
-    {
-        return fileAnalysis_.getNodesConcurrentTo(node);
-    }
-   
-    /**
-     * Prints out results for debugging
-     *
-     */
-    protected void printPASTResults()
-    {
-        // output the results
-        for(int i=0; i<past_.length; i++) {
-            System.out.print(past_[i].getType()+" "+(past_[i].isCompiled() ? "compiled": "not compiled"));
-            System.out.print(" at ("+ past_[i].getFilename()+","+past_[i].getStartingLine()+","+
-                    past_[i].getStartLocation()+","+past_[i].getEndLocation()+") ");
-            if (past_[i] instanceof PASTOMPPragma) {
-                int t = ((PASTOMPPragma)past_[i]).getOMPType();
-                System.out.println(" OMPPragma type="+t);
-            }
-            else System.out.println("");
-        }
-    }
-	
-    /**
-     * Compute which statements compiled
-     *
-     */
-	private void computeCompiled()
-	{
-		Stack   context = new Stack();
-        boolean currentEvaluation = true;
-        int     currentLevel      = 0;
-        int     lastNonIgnoredIf  = currentLevel;
-		context.push(new CompiledContext(currentLevel, currentEvaluation));
-        
-        int   ifcount=0;
-        int   endifcount=0;
-
-        int i=0;
-        for(i=0; i<past_.length; i++) {
-        	PASTNode node = past_[i];
-        	if(node==null){
-        		int stopHere=0;
-        	}
-        	if (currentEvaluation) {
-        		if (isIf(node)) {
-        			currentEvaluation = ifDecision(node);
-        			currentLevel++;  lastNonIgnoredIf++;
-        			context.push(new CompiledContext(currentLevel, currentEvaluation));
-                    ifcount++;
-        		}
-        		else if (isElse(node)) {
-       				currentEvaluation = false;
-                    if (context.empty())  break;
-      				((CompiledContext)(context.peek())).setEvaluation(currentEvaluation);
-        		}
-                else if (isElseif(node)) {
-                    CompiledContext cc = ((CompiledContext)(context.peek()));
-                    cc.setWasTrue(true);
-                    currentEvaluation = false;
-                    // Don't bump the level
-                    cc.setEvaluation(false);
-                }
-        		else if (isEnd(node)) {
-                    if (context.empty()) break;
-      				context.pop();
-       				currentLevel--;  lastNonIgnoredIf--;
-                    if (context.empty())  break;
-       				currentEvaluation = ((CompiledContext)(context.peek())).getEvaluation();
-                    endifcount++;
-        		}
-        		node.setCompiled(true);
-        	}
-        	else { // current evaluation == false
-        		if (currentLevel==lastNonIgnoredIf) {
-                    if (isIf(node)) {
-                        currentLevel++;
-                        node.setCompiled(false);
-                        ifcount++;
-                    }
-                    else if (isElse(node)) {
-                        CompiledContext cc = ((CompiledContext)(context.peek()));
-                        if (cc.wasTrue())
-                            currentEvaluation = false;
-                        else
-        				  currentEvaluation = true;
-                        if (context.empty()) break;
-        				((CompiledContext)(context.peek())).setEvaluation(currentEvaluation);
-                        node.setCompiled(true);  // means was not ignored - had effect
-        			}
-                    else if (isElseif(node)) {
-                        CompiledContext cc = ((CompiledContext)(context.peek()));
-                        if (cc.wasTrue())
-                          currentEvaluation = false;
-                        else {
-                          currentEvaluation = ifDecision(node);
-                          if (currentEvaluation) cc.setWasTrue(true);
-                        }
-                        // Don't bump the level
-                        cc.setEvaluation(currentEvaluation);
-                    }
-        			else if (isEnd(node)) {
-        				context.pop();
-        				currentLevel--;  lastNonIgnoredIf--;
-                        if (context.empty()) break;
-        				currentEvaluation = ((CompiledContext)(context.peek())).getEvaluation();
-                        node.setCompiled(currentEvaluation);
-                        endifcount++;
-        			}
-                    else
-            		  node.setCompiled(false);
-        		}
-                else {
-                	if (isIf(node)) {
-                		currentLevel++;
-                		ifcount++;
-                	}
-                	else if (isEnd(node)) {
-                        currentLevel--;
-                        endifcount++;
-                    }
-                    node.setCompiled(false);
-                }
-        	}
-
-        }
-	}
-	
-    /**
-     * Determine if node is a branch
-     * @param node
-     * @return
-     */
-	private boolean isIf(PASTNode node)
-	{
-		return (node instanceof PASTIf) || (node instanceof PASTIfdef) || (node instanceof PASTIfndef);
-	}
-	
-    /**
-     * Retrieve the compile decision of the 'if' condition
-     * @param node
-     * @return
-     */
-	private boolean ifDecision(PASTNode node)
-	{
-		if (node instanceof PASTIf) return ((PASTIf)node).taken();
-		else if (node instanceof PASTIfdef) return ((PASTIfdef)node).taken();
-		else if (node instanceof PASTIfndef) return ((PASTIfndef)node).taken();
-		else
-			return false;
-	}
-	
-    /**
-     * Determine if the node is of 'else' kind
-     * @param node
-     * @return
-     */
-	private boolean isElse(PASTNode node)
-	{
-		return (node instanceof PASTElse);
-	}
-    
-    /**
-     * Determine if the node is of 'elseif' kind
-     * @param node
-     * @return
-     */
-    private boolean isElseif(PASTNode node)
-    {
-        return (node instanceof PASTElif);
-    }
-	
-    /**
-     * Determine if node is of 'end' kind
-     * @param node
-     * @return
-     */
-	private boolean isEnd(PASTNode node)
-	{
-		return (node instanceof PASTEndif);
-	}
-	
-	
-    /**
-    * Stack object used for evaluating "compiled" state of PP's
-    */
-	private static class CompiledContext
-	{
-		private boolean evaluation_  = false;
-		private int     nestedLevel_ = 0;
-        private boolean wasTrue_     = false;  // used for elif situations
-		
-		public CompiledContext(int nestedLevel, boolean evaluation)
-		{
-			evaluation_  = evaluation;
-			nestedLevel_ = nestedLevel;
-		}
-		
-		public boolean getEvaluation()
-		{
-			return evaluation_;
-		}
-		
-		public void setEvaluation(boolean evaluation)
-		{
-			evaluation_ = evaluation;
-		}
-		
-		public int getNestedLevel()
-		{
-			return nestedLevel_;
-		}
-        
-        public boolean wasTrue()              { return wasTrue_; }
-        public void    setWasTrue(boolean tf) { wasTrue_=tf; }
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPError.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPError.java
deleted file mode 100644
index 3d54309..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPError.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis;
-/**
- * @author pazel
- */
-public class OpenMPError
-{
-    protected String description_ = "";
-    protected String filename_    = "";
-    protected String path_        = "";
-    protected int    lineno_      = 0;
-    protected int    severity_    = INFO;
-    
-    // severity codes
-    public static final int INFO    = 0;
-    public static final int WARN    = 1;
-    public static final int ERROR   = 2;
-    
-    /**
-     * OpenMPError - holds error information
-     * @param description - of problem
-     * @param filename    - of problem
-     * @param path        - of filename
-     * @param lineno      - of problem
-     * @param severity    - of problem
-     */
-    public OpenMPError(String description, String filename, String path, int lineno, int severity)
-    {
-        description_ = description;
-        filename_    = filename;
-        path_        = path;
-        lineno_      = lineno;
-        severity_    = severity;
-    }
-    
-    /**
-     * OpenMPError - holds error information
-     * @param description - String
-     * @param fqn         - String (path+filename)
-     * @param lineno      - of problem
-     * @param severity    - of problem
-     */
-    public OpenMPError(String description, String fqn, int lineno, int severity)
-    {
-        description_ = description;
-        
-        int l1 = fqn.lastIndexOf('/');   int l2 = fqn.lastIndexOf('\\');
-        int lastIndex = Math.max(l1, l2);
-        if (lastIndex==-1 || lastIndex>fqn.length()+1) 
-            filename_=fqn;
-        else {
-            filename_=fqn.substring(lastIndex+1);
-            path_=fqn.substring(0, lastIndex);
-        }
-        
-        lineno_      = lineno;
-        severity_    = severity;
-    }
-
-    
-    // accessors
-    
-    public String getDescription() { return description_; }
-    public String getFilename()    { return filename_;    }
-    public String getPath()        { return path_;        }
-    public int    getLineno()      { return lineno_;      }
-    public int    getSeverity()    { return severity_;    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPErrorManager.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPErrorManager.java
deleted file mode 100644
index 8bdb950..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMPErrorManager.java
+++ /dev/null

@@ -1,63 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006, 2007 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.analysis;
-
-import java.util.LinkedList;
-
-/**
- * Holds all the errors encountered during analysis, ref. OpenMPAnalysisManager
- * 
- * @author pazel
- *
- */
-public class OpenMPErrorManager
-{
-    protected LinkedList errors_ = new LinkedList();    // holds the errors
-    
-    protected static OpenMPErrorManager currentManager_ = null;
-    
-    /**
-     * OpenMPErrorManager - constructor
-     *
-     */
-    public OpenMPErrorManager()
-    {
-        currentManager_ = this;
-    }
-    
-    /**
-     * Get the current error manager
-     * @return OpenMPErrorManager
-     */
-    public static OpenMPErrorManager getCurrentErrorManager()
-    {
-        return currentManager_;
-    }
-    
-    /**
-     * Add an error
-     * @param error - OpenMPError
-     */
-    public void addError(OpenMPError error)
-    {
-        errors_.add(error);
-    }
-    
-    /**
-     * Return an list of all errors
-     * @return LinkedList
-     */
-    public LinkedList getErrors()
-    {
-        return errors_;
-    }
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMpIDs.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMpIDs.java
deleted file mode 100644
index 5933124..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/OpenMpIDs.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis;
-
-/**
- * IDs e.g. for markers
- * 
- * @deprecated
- * @see org.eclipse.ptp.pldt.openmp.analysis.internal.core.OpenMpIDs
- * @author tibbitts
- * 
- */
-public class OpenMpIDs {
-	/**
-	 * These are the marker type used for showing concurrency
-	 */
-
-	public static final String ConcurrencyType = "org.eclipse.ptp.pldt.openmp.analysis.concurrency";
-	/**
-	 * These are the marker type used for showing non-concurrency
-	 */
-	public static final String NonConcurrencyType = "org.eclipse.ptp.pldt.openmp.analysis.nonconcurrency";
-
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTElif.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTElif.java
deleted file mode 100644
index 656ee84..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTElif.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorElifStatement;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-
-/**
- * @author pazel
- */
-public class PASTElif extends PASTNode  implements IASTPreprocessorElifStatement
-{
-	protected IASTPreprocessorElifStatement elif_ = null;
-	
-    /**
-     * PASTElif - Elif preprocessor statement (constructor)
-     * @param elif: ASTElif
-     */
-	public PASTElif(IASTPreprocessorElifStatement elif)
-	{
-		super((ASTNode)elif);
-		elif_ = elif;
-	}
-    
-    public String getType()
-    {
-        return "#elif";
-    }
-
-    /**
-     * taken - reflects ASTElif choice
-     */
-	public boolean taken() {
-		return elif_.taken();
-	}
-
-	public char[] getCondition() {
-		return elif_.getCondition();
-	}
-
-	public boolean isPartOfTranslationUnitFile() {
-		return elif_.isPartOfTranslationUnitFile();
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTElse.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTElse.java
deleted file mode 100644
index df255be..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTElse.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.openmp.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorElseStatement;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-
-/**
- * 
- * @author pazel
- *
- */
-public class PASTElse extends PASTNode implements IASTPreprocessorElseStatement
-{
-	protected IASTPreprocessorElseStatement else_ = null;
-	
-    /**
-     * PASTElse - Else preprocessor statement (Constructor)
-     * @param elsee
-     */
-	public PASTElse(IASTPreprocessorElseStatement elsee)
-	{
-		super((ASTNode)elsee);
-		else_ = elsee;
-	}
-    
-    public String getType()
-    {
-        return "#else";
-    }
-
-    /**
-     * taken - reflects ASTElse choice
-     */
-	public boolean taken() {
-		return else_.taken();
-	}
-
-	public boolean isPartOfTranslationUnitFile() {
-		return else_.isPartOfTranslationUnitFile();
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTEndif.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTEndif.java
deleted file mode 100644
index 56c5242..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTEndif.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorEndifStatement;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-
-/**
- * 
- * @author pazel
- *
- */
-public class PASTEndif extends PASTNode implements IASTPreprocessorEndifStatement
-{
-	private IASTPreprocessorEndifStatement   endif_ = null;
-	
-    /**
-     * PASTEndif - Endif proprocessor statment (Constructor)
-     * @param endif: ASTEndif
-     */
-    public PASTEndif(IASTPreprocessorEndifStatement endif)
-    {
-    	super((ASTNode)endif);
-    	endif_ = endif;
-    }
-     
-    public String getType()
-    {
-        return "#endif";
-    }
-
-	public boolean isPartOfTranslationUnitFile() {
-		return endif_.isPartOfTranslationUnitFile();
-	}
-
-    
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTError.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTError.java
deleted file mode 100644
index b48dc8d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTError.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorErrorStatement;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-
-/**
- * 
- * @author pazel
- *
- */
-public class PASTError extends PASTNode implements IASTPreprocessorErrorStatement
-{
-	protected IASTPreprocessorErrorStatement error_ = null;
-	
-    /**
-     * PASTError - Error preprocessor statment (Constructor)
-     * @param error: ASTError
-     */
-	public PASTError(IASTPreprocessorErrorStatement error)
-	{
-		super((ASTNode)error);
-		error_ = error;
-	}
-    
-    public String getType()
-    {
-        return "#error";
-    }
-
-	public char[] getMessage() {
-		return error_.getMessage();
-	}
-
-	public boolean isPartOfTranslationUnitFile() {
-		return error_.isPartOfTranslationUnitFile();
-	}
-
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTFactory.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTFactory.java
deleted file mode 100644
index 7b6d99e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTFactory.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006, 2007 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.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorElifStatement;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorElseStatement;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorEndifStatement;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorErrorStatement;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorFunctionStyleMacroDefinition;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorIfStatement;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorIfdefStatement;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorIfndefStatement;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorIncludeStatement;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorObjectStyleMacroDefinition;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorPragmaStatement;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorStatement;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorUndefStatement;
-
-
-
-/**
- * Create our new PAST types from old AST types
- * @author pazel
- */
-public class PASTFactory 
-{
-    /**
-     * PASTFactoryMake - Conversion from AST to PAST
-     * @param node: IASTPreprocessorStatement
-     * @return PASTNode
-     */
-    public static PASTNode PASTFactoryMake(IASTPreprocessorStatement node)
-    {
-    	if (node instanceof IASTPreprocessorEndifStatement)
-    		return new PASTEndif((IASTPreprocessorEndifStatement)node);
-    	else if (node instanceof IASTPreprocessorElifStatement)
-    		return new PASTElif((IASTPreprocessorElifStatement)node);
-    	else if (node instanceof IASTPreprocessorElseStatement)
-    		return new PASTElse((IASTPreprocessorElseStatement)node);
-    	else if (node instanceof IASTPreprocessorIfndefStatement)
-    		return new PASTIfndef((IASTPreprocessorIfndefStatement)node);
-    	else if (node instanceof IASTPreprocessorIfdefStatement)
-    		return new PASTIfdef((IASTPreprocessorIfdefStatement)node);
-    	else if (node instanceof IASTPreprocessorIfStatement)
-    		return new PASTIf((IASTPreprocessorIfStatement)node);
-    	else if (node instanceof IASTPreprocessorErrorStatement)
-    		return new PASTError((IASTPreprocessorErrorStatement)node);
-    	else if (node instanceof IASTPreprocessorPragmaStatement)
-    		return new PASTPragma((IASTPreprocessorPragmaStatement)node);
-    	else if (node instanceof IASTPreprocessorUndefStatement)
-    		return new PASTUndef((IASTPreprocessorUndefStatement)node);
-    	else if (node instanceof IASTPreprocessorIncludeStatement)
-    		return new PASTInclusionStatement((IASTPreprocessorIncludeStatement)node);
-    	else if (node instanceof IASTPreprocessorFunctionStyleMacroDefinition)
-    		return new PASTFunctionMacro((IASTPreprocessorFunctionStyleMacroDefinition)node);
-        else if (node instanceof IASTPreprocessorObjectStyleMacroDefinition)
-            return new PASTObjectMacro((IASTPreprocessorObjectStyleMacroDefinition)node);
-        else{
-        	return null;//what is node?   LocationMap$ASTWarning.
-        }
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTFunctionMacro.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTFunctionMacro.java
deleted file mode 100644
index 5ace67b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTFunctionMacro.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionStyleMacroParameter;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorFunctionStyleMacroDefinition;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-
-/**
- * 
- * @author pazel
- *
- */
-public class PASTFunctionMacro extends PASTNode implements IASTPreprocessorFunctionStyleMacroDefinition
-{
-	protected IASTPreprocessorFunctionStyleMacroDefinition macro_ = null;
-	
-    /**
-     * PASTFunctionMacro - "define" function macro (Constructor)
-     * @param macro
-     */
-	public PASTFunctionMacro(IASTPreprocessorFunctionStyleMacroDefinition macro)
-	{
-		super((ASTNode)macro);
-		macro_ = macro;
-	}
-    
-    public String getType()
-    {
-        return "#define";
-    }
-
-    /**
-     * Delegated methods for interface IASTPreprocessorFunctionStyleMacroDefinition
-     */
-	public String getExpansion() {
-		return macro_.getExpansion();
-	}
-
-	public IASTName getName() {
-		return macro_.getName();
-	}
-
-	public void setExpansion(String exp) {
-	  macro_.setExpansion(exp);	
-	}
-
-	public void setName(IASTName name) {
-      macro_.setName(name);		
-	}
-
-	public void addParameter(IASTFunctionStyleMacroParameter parm) {
-      macro_.addParameter(parm);		
-	}
-
-	public IASTFunctionStyleMacroParameter[] getParameters() {
-		return macro_.getParameters();
-	}
-
-	public int getRoleForName(IASTName n) {
-		return macro_.getRoleForName(n);
-	}
-
-	public IASTFileLocation getExpansionLocation() {
-		return macro_.getExpansionLocation();
-	}
-
-	public boolean isPartOfTranslationUnitFile() {
-		return macro_.isPartOfTranslationUnitFile();
-	}
-	
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTIf.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTIf.java
deleted file mode 100644
index 38e2acf..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTIf.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorIfStatement;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-
-/**
- * 
- * @author pazel
- *
- */
-public class PASTIf extends PASTNode implements IASTPreprocessorIfStatement
-{
-	protected IASTPreprocessorIfStatement if_ = null;
-	
-    /**
-     * PASTIf - constructor
-     * @param ifx
-     */
-	public PASTIf(IASTPreprocessorIfStatement ifx)
-	{
-		super((ASTNode)ifx);
-		if_ = ifx;
-	}
-    
-    public String getType()
-    {
-        return "#if";
-    }
-
-	public boolean taken() {
-		return if_.taken();
-	}
-
-	//cdt40
-	public char[] getCondition() {
-		return if_.getCondition();
-	}
-
-	public boolean isPartOfTranslationUnitFile() {
-		return if_.isPartOfTranslationUnitFile();
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTIfdef.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTIfdef.java
deleted file mode 100644
index 6325ca8..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTIfdef.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorIfdefStatement;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-
-/**
- * 
- * @author pazel
- *
- */
-public class PASTIfdef extends PASTNode implements IASTPreprocessorIfdefStatement
-{
-	protected IASTPreprocessorIfdefStatement ifdef_ = null;
-	
-    /**
-     * PASTIfdef - constructor
-     * @param ifdef
-     */
-	public PASTIfdef(IASTPreprocessorIfdefStatement ifdef)
-	{
-		super((ASTNode)ifdef);
-		ifdef_ = ifdef;
-	}
-    
-    public String getType()
-    {
-        return "#ifdef";
-    }
-
-
-	public boolean taken() {
-		return ifdef_.taken();
-	}
-
-	public char[] getCondition() {
-		return ifdef_.getCondition();
-	}
-
-	public IASTName getMacroReference() {
-		return ifdef_.getMacroReference();
-	}
-
-	public boolean isPartOfTranslationUnitFile() {
-		return ifdef_.isPartOfTranslationUnitFile();
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTIfndef.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTIfndef.java
deleted file mode 100644
index 58f9a5c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTIfndef.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorIfndefStatement;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-
-/**
- * 
- * @author pazel
- *
- */
-public class PASTIfndef extends PASTNode implements IASTPreprocessorIfndefStatement
-{
-	protected IASTPreprocessorIfndefStatement ifndef_ = null;
-	
-    /**
-     * PASTIfndef - constructor
-     * @param ifndef
-     */
-	public PASTIfndef(IASTPreprocessorIfndefStatement ifndef)
-	{
-		super((ASTNode)ifndef);
-		ifndef_ = ifndef;
-	}
-    
-    public String getType()
-    {
-        return "#ifndef";
-    }
-
-
-	public boolean taken() {
-		return ifndef_.taken();
-	}
-
-	public char[] getCondition() {
-		return ifndef_.getCondition();
-	}
-
-	public IASTName getMacroReference() {
-		return ifndef_.getMacroReference();
-	}
-
-	public boolean isPartOfTranslationUnitFile() {
-		return ifndef_.isPartOfTranslationUnitFile();
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTInclusionStatement.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTInclusionStatement.java
deleted file mode 100644
index 914548e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTInclusionStatement.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006, 2007 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.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorIncludeStatement;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-
-/**
- * 
- * @author pazel
- *
- */
-public class PASTInclusionStatement extends PASTNode implements IASTPreprocessorIncludeStatement
-{
-	protected IASTPreprocessorIncludeStatement incl_ = null;
-	
-    /**
-     * PASTInclusionStatement - constructor
-     * @param incl: ASTInclusionStatement
-     */
-	public PASTInclusionStatement(IASTPreprocessorIncludeStatement incl)
-	{
-		super((ASTNode)incl);
-		incl_ = incl;
-	}
-    
-    public String getType()
-    {
-        return "#include";
-    }
-
-
-	public String getPath() {
-		return incl_.getPath();
-	}
-
-	// cdt40
-	public IASTName getName() {
-		return incl_.getName();
-	}
-
-	// cdt40
-	public boolean isSystemInclude() {
-		return incl_.isSystemInclude();
-	}
-	// cdt40
-	public boolean isActive() {
-		return incl_.isActive();
-	}
-	// cdt40
-	public boolean isResolved() {
-		return incl_.isResolved();
-	}
-
-	/**
-	 * CDT 6.0 implement isPartOfTranslationUnitFile()
-	 * @return
-	 */
-	public boolean isPartOfTranslationUnitFile() {
-		return incl_.isPartOfTranslationUnitFile();
-	}
-	/**
-	 * CDT 6.0 implement  IASTPreprocessorIncludeStatement.isResolvedByHeuristics()
-	 */
-	public boolean isResolvedByHeuristics(){
-		return false;
-		
-	}
-	
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTNode.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTNode.java
deleted file mode 100644
index fdc7ba9..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTNode.java
+++ /dev/null

@@ -1,227 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006, 2007 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.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.ASTNodeProperty;
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.ExpansionOverlapsBoundaryException;
-import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTNodeLocation;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.parser.IToken;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-
-/**
- * Preprocessor node, pseudo for IASTNode, used for analysis
- * 
- * @author pazel
- *
- */
-public abstract class PASTNode implements IASTNode 
-{
-
-    protected ASTNode   astNode_  = null;
-    protected boolean                      compiled_ = false;
-    
-    // Location information
-    protected int startingLine_     = -1;
-    protected int startLocation_    = -1;
-    protected int endLocation_      = -1;
-    protected String filename_      = "";
-    
-    /**
-     * PASTNode - Constructor
-     * @param astNode: LocationMap.ScannerASTNode
-     */
-    public PASTNode(ASTNode astNode)
-    {
-    	astNode_ = astNode;
-        
-        getLocationInfo();
-    }
-    
-    /**
-     * PASTNode - Copy Constructor
-     * @param n
-     */
-    public PASTNode(PASTNode n)
-    {
-       astNode_       = n.astNode_;
-       compiled_      = n.compiled_;
-       startingLine_  = n.startingLine_;
-       startLocation_ = n.startLocation_;
-       filename_      = n.filename_;
-    }
-    
-    /**
-     * getLocationInfo - Line number, offset, etc
-     *
-     */
-    protected void getLocationInfo()
-    {
-        IASTNodeLocation[] locations = astNode_.getNodeLocations();
-        filename_ = astNode_.getContainingFilename();
-        if (locations.length == 1) {
-            IASTFileLocation astFileLocation = null;
-            if (locations[0] instanceof IASTFileLocation) {
-                astFileLocation = (IASTFileLocation) locations[0];
-                startingLine_  = astFileLocation.getStartingLineNumber();
-                startLocation_ = astFileLocation.getNodeOffset();
-                endLocation_   = astFileLocation.getNodeOffset() + astFileLocation.getNodeLength();
-            }
-        }
-    }
-    
-    /**
-     * getFilename - accessor
-     * @return String
-     */
-    public String getFilename() { return filename_; }
-    
-    /**
-     * getStartingLine - accessor
-     * @return int
-     */
-    public int    getStartingLine() { return startingLine_; }
-    
-    /**
-     * getStartLocation - accessor
-     * @return int
-     */
-    public int    getStartLocation() { return startLocation_; }
-    
-    /**
-     * getEndLocation - accessor
-     * @return int
-     */
-    public int    getEndLocation()   { return endLocation_; }
-    
-    /**
-     * getType - descriptive text for type of node
-     * @return String
-     */
-    public abstract String getType();
-    
-    /**
-     * setCompiled - setter
-     * @param compiled: boolean
-     */
-    public void setCompiled(boolean compiled)
-    {
-    	compiled_ = compiled;
-    }
-    
-    /**
-     * isCompiled - accessor
-     * @return boolean
-     */
-    public boolean isCompiled()
-    {
-    	return compiled_;
-    }
-
-    /**
-     * delegated methods for interface IASTNode
-     */
-	public boolean accept(ASTVisitor visitor) {
-		return astNode_.accept(visitor);
-	}
-	/**  @since cdt40*/
-    public boolean contains(IASTNode node) {
-    	return astNode_.contains(node);
-    }
-
-
-	public String getContainingFilename() {
-		return astNode_.getContainingFilename();
-	}
-
-	public IASTFileLocation getFileLocation() {
-		return astNode_.getFileLocation();
-	}
-
-	public IASTNodeLocation[] getNodeLocations() {
-		return astNode_.getNodeLocations();
-	}
-
-	public IASTNode getParent() {
-		return astNode_.getParent();
-	}
-
-	public ASTNodeProperty getPropertyInParent() {
-		return astNode_.getPropertyInParent();
-	}
-
-	public String getRawSignature() {
-		return astNode_.getRawSignature();
-	}
-
-	public IASTTranslationUnit getTranslationUnit() {
-		return astNode_.getTranslationUnit();
-	}
-
-	public void setParent(IASTNode node) {
-		astNode_.setParent(node);
-	}
-
-	public void setPropertyInParent(ASTNodeProperty property) {
-		astNode_.setPropertyInParent(property);
-	}
-	/**
-	 *  CDT6.0 implement IASTNode.copy()
-	 */
-	public IASTNode copy(){
-		return astNode_.copy();
-	}
-	/**
-	 *  CDT6.0 implement IASTNode.getChildren()
-	 */
-	public IASTNode[] getChildren(){
-		return astNode_.getChildren();
-	}
-	/**
-	 *  CDT6.0 implement IASTNode.getSyntax()
-	 */
-	public IToken getSyntax() throws ExpansionOverlapsBoundaryException{
-		return astNode_.getSyntax();
-		
-	}
-	/**
-	 *  CDT6.0 implement IASTNode.getLeadingSyntax()
-	 */
-	public IToken getLeadingSyntax() throws ExpansionOverlapsBoundaryException{
-		return astNode_.getLeadingSyntax();
-	}
-	/**
-	 *  CDT6.0 implement IASTNode.getTrailingSyntax()
-	 */
-	public IToken getTrailingSyntax() throws ExpansionOverlapsBoundaryException{
-		return astNode_.getTrailingSyntax();		
-	}
-	/**
-	 *  CDT6.0 implement IASTNode.isActive()
-	 */
-	public boolean isActive(){
-		return astNode_.isActive();
-		
-	}
-	/**
-	 *  CDT6.0 implement IASTNode.isFrozen()
-	 */
-	public boolean isFrozen(){
-		return astNode_.isFrozen();
-		
-	}
-	
-	
-    
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTOMPFactory.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTOMPFactory.java
deleted file mode 100644
index ecaac7b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTOMPFactory.java
+++ /dev/null

@@ -1,1215 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006, 2007 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.analysis.PAST;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement;
-import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
-import org.eclipse.cdt.core.dom.ast.IASTForStatement;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.ast.IScope;
-import org.eclipse.cdt.core.parser.IToken;
-import org.eclipse.cdt.internal.core.dom.parser.ASTInternal;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.ptp.pldt.common.util.Utility;
-import org.eclipse.ptp.pldt.openmp.analysis.OpenMPError;
-import org.eclipse.ptp.pldt.openmp.analysis.OpenMPErrorManager;
-import org.eclipse.ptp.pldt.openmp.analysis.dictionary.Dictionary;
-import org.eclipse.ptp.pldt.openmp.analysis.dictionary.Symbol;
-import org.eclipse.ptp.pldt.openmp.analysis.parser.OpenMPScanner;
-import org.eclipse.ptp.pldt.openmp.analysis.parser.OpenMPToken;
-
-/**
- * Factory to convert PASTPragma-->PASTOMPPragma
- * 
- * @author pazel
- * 
- */
-public class PASTOMPFactory {
-	protected PASTPragma pragma_ = null;
-	protected PASTOMPPragma ompPragma_ = null;
-	protected IASTTranslationUnit ast_ = null;
-	protected Dictionary dictionary_ = null;
-
-	private static final boolean traceOn = false;
-
-	protected OpenMPScanner scanner_ = null;
-	protected OpenMPToken token_ = null;
-
-	// protected ScannerCallbackManager callbackManager_ = null;
-
-	/**
-	 * Factory used only by this class
-	 * 
-	 * @param pragma
-	 *            - PASTPragma
-	 */
-	protected PASTOMPFactory(PASTPragma pragma, IASTTranslationUnit ast, Dictionary dictionary) {
-		pragma_ = pragma;
-		scanner_ = new OpenMPScanner(pragma_.getContent());
-		ast_ = ast;
-		dictionary_ = dictionary;
-
-		// experiment();
-
-		if (traceOn)
-			readTokens();
-
-		// otherinit(null);
-	}
-
-	private void experiment() {
-		IASTFileLocation loc = pragma_.getFileLocation();
-		if (loc != null) {
-			IDocument document = Utility.getDocument(loc.getFileName());
-			if (document != null) {
-				try {
-					String txt = document.get(pragma_.getLocalOffset(), pragma_.getLength());
-					System.out.println(txt);
-				} catch (Exception e) {
-				}
-			}
-		}
-	}
-
-	/**
-	 * Return either omp or non-omp pragma
-	 * 
-	 * @return
-	 */
-	protected PASTPragma retrievePragma() {
-		return (ompPragma_ != null ? ompPragma_ : pragma_);
-	}
-
-	/**
-	 * Factory for making the PASTOMPPragma structure if possible
-	 * 
-	 * @param pragma
-	 *            : PASTPragma
-	 * @param ast
-	 *            : IASTTranslationUnit
-	 * @param dictionary
-	 *            : Dictionary
-	 * @return: PASTPragma (or PASTOMPPragma if do-able)
-	 */
-	public static PASTPragma makePASTOMP(PASTPragma pragma, IASTTranslationUnit ast, Dictionary dictionary) {
-		PASTOMPFactory factory = new PASTOMPFactory(pragma, ast, dictionary);
-		factory.parse();
-		factory.locateRegion();
-		return factory.retrievePragma();
-	}
-
-	/**
-	 * Parse the pragma context for OMP
-	 * 
-	 * @return boolean
-	 */
-	protected boolean parse() {
-		// The first two tokens should be # and pragma
-		OpenMPToken tok = nextToken();
-		if (tok == null) {
-			if (traceOn)
-				System.out.println("PASTOMPFactory.parser()..null token, ignored.");
-			return false; // robustly handle empty tokens
-		}
-		if (tok.getType() != OpenMPScanner.mpPound)
-			return false;
-		tok = nextToken();
-		if (tok.getType() != OpenMPScanner.mpPragma)
-			return false;
-
-		// if next is not omp - this is not an openmp directive
-		if (nextToken().getType() != OpenMPScanner.mpOmp)
-			return false;
-
-		// Construct the OpenMP pragma
-		ompPragma_ = new PASTOMPPragma(pragma_);
-
-		// The next token sets the type
-		nextToken();
-		OpenMPToken typeToken = token_; // determines type, used for error
-										// message
-		if (token_ == null)
-			return false;
-		ompPragma_.setOMPType(setOMPType(token_.getType()));
-
-		if (token_ == null)
-			return false;
-
-		switch (ompPragma_.getOMPType()) {
-		case PASTOMPPragma.OmpParallel:
-			completeParallel();
-			break;
-		case PASTOMPPragma.OmpFor:
-			completeFor();
-			break;
-		case PASTOMPPragma.OmpParallelFor:
-			completeParallelFor();
-			break;
-		case PASTOMPPragma.OmpSections:
-			completeSections();
-			break;
-		case PASTOMPPragma.OmpParallelSections:
-			completeParallelSections();
-			break;
-		case PASTOMPPragma.OmpSingle:
-			completeSingle();
-			break;
-		case PASTOMPPragma.OmpMaster:
-			break;
-		case PASTOMPPragma.OmpCritical:
-			break;
-		case PASTOMPPragma.OmpBarrier:
-			break;
-		case PASTOMPPragma.OmpAtomic:
-			break;
-		case PASTOMPPragma.OmpSection:
-			break;
-		case PASTOMPPragma.OmpFlush:
-			completeFlush();
-			break;
-		case PASTOMPPragma.OmpOrdered:
-			break;
-		case PASTOMPPragma.OmpThreadPrivate:
-			completeThreadPrivate();
-			break;
-		case PASTOMPPragma.OmpUnknown:
-			String typeString = (typeToken != null ? typeToken.getImage() : "");
-			handleProblem("Unexpected token '" + typeString + "'", OpenMPError.ERROR);
-			break;
-		}
-
-		// all remaining tokens are bogus
-		while (token_ != null) {
-			handleProblem("Unexpected token '" + token_.getImage() + "'", OpenMPError.ERROR);
-			nextToken();
-		}
-
-		return true;
-	}
-
-	/**
-	 * Set the type of OpenMP statement based on keyword
-	 * 
-	 * @param t
-	 * @return Note: always exit with the current token being the next to
-	 *         process, i.e. call nextToken()
-	 */
-	protected int setOMPType(int t) {
-		nextToken(); // advance to next token
-		switch (t) {
-		case OpenMPScanner.mpParallel:
-			if (token_ == null)
-				return PASTOMPPragma.OmpParallel;
-			if (token_.getType() == OpenMPScanner.mpFor) {
-				nextToken();
-				return PASTOMPPragma.OmpParallelFor;
-			} else if (token_.getType() == OpenMPScanner.mpSections) {
-				nextToken();
-				return PASTOMPPragma.OmpParallelSections;
-			}
-			return PASTOMPPragma.OmpParallel;
-		case OpenMPScanner.mpFor:
-			return PASTOMPPragma.OmpFor;
-		case OpenMPScanner.mpSections:
-			return PASTOMPPragma.OmpSections;
-		case OpenMPScanner.mpSection:
-			return PASTOMPPragma.OmpSection;
-		case OpenMPScanner.mpSingle:
-			return PASTOMPPragma.OmpSingle;
-		case OpenMPScanner.mpMaster:
-			return PASTOMPPragma.OmpMaster;
-		case OpenMPScanner.mpCritical:
-			return PASTOMPPragma.OmpCritical;
-		case OpenMPScanner.mpBarrier:
-			return PASTOMPPragma.OmpBarrier;
-		case OpenMPScanner.mpAtomic:
-			return PASTOMPPragma.OmpAtomic;
-		case OpenMPScanner.mpFlush:
-			return PASTOMPPragma.OmpFlush;
-		case OpenMPScanner.mpOrdered:
-			return PASTOMPPragma.OmpOrdered;
-		case OpenMPScanner.mpThreadPrivate:
-			return PASTOMPPragma.OmpThreadPrivate;
-		}
-		return PASTOMPPragma.OmpUnknown;
-	}
-
-	/**
-	 * Parse a list of identifiers, e.g. as from shared(...)
-	 * 
-	 * @return OpenMPToken []
-	 */
-	protected OpenMPToken[] getIdentifierList() {
-		LinkedList l = new LinkedList();
-
-		if (token_ == null)
-			return null;
-		// if (token_.getType()!=IToken.tLPAREN) return null;
-
-		// look for lists like a,b,c
-		boolean commaNext = false;
-		nextToken();
-		while (token_ != null) {
-			if (commaNext) {
-				if (token_.getType() != IToken.tCOMMA)
-					break;
-				else {
-					commaNext = false;
-					nextToken();
-					continue;
-				}
-			}
-			// whatever it is, add to the list
-			l.add(token_);
-			commaNext = true;
-			nextToken();
-		}
-
-		// build the list
-		OpenMPToken[] ompl = new OpenMPToken[l.size()];
-		int count = 0;
-		for (Iterator i = l.iterator(); i.hasNext();) {
-			ompl[count++] = (OpenMPToken) i.next();
-			// check to see if in dictionary
-			Symbol[] symbols = dictionary_.getSymbolsFor(ompl[count - 1].getImage());
-			if (symbols.length == 0) {
-				handleProblem("Undefined symbol '" + ompl[count - 1].getImage() + "'", OpenMPError.ERROR);
-			} else {
-				// try to find at least one (non-global that is in same scope as
-				// pragma
-				boolean found = false;
-				for (int j = 0; j < symbols.length; j++) {
-					IASTNode fctn = symbols[j].getDefiningFunction();
-					if (fctn == null || !(fctn instanceof IASTFunctionDefinition))
-						continue;
-					if (isSymbolRelevant(symbols[j])) {
-						found = true;
-						break;
-					}
-				}
-				if (!found)
-					handleProblem("Symbol out of scope: '" + ompl[count - 1].getImage() + "'", OpenMPError.ERROR);
-			}
-		}
-
-		// rule: always leave one ahead
-		nextToken();
-
-		return ompl;
-	}
-
-	/**
-	 * See if symbol is a local variable in scope to pragma
-	 * 
-	 * @param symbol
-	 *            - Symbol
-	 * @return boolean
-	 */
-	protected boolean isSymbolRelevant(Symbol symbol) {
-		if (traceOn)
-			System.out.println("Symbol: " + symbol.getName() + "  PASTOMPFactory.isSymbolRelevant()");
-		IASTNode node = null;
-		IASTNode parent, gp = null;
-		try {
-			// node=symbol.getScope().getPhysicalNode(); // no longer in CDT 4.0
-			// BRT replacement for getPhysicalNode() for CDT 4.0
-			// The following probably isn't an ideal solution (using Discouraged
-			// access methods)
-			// but seems to work for now.
-			// alternatively I tried implementing: symbol.getPhysicalNode() but
-			// could not get the same answer from there.
-
-			IScope scope = symbol.getScope();
-			// see: http://dev.eclipse.org/mhonarc/lists/cdt-dev/msg08653.html
-			// Another alternative would be to cast to CScope and do
-			// cScope.getPhysicalNode() from there.
-			node = ASTInternal.getPhysicalNodeOfScope(scope);
-
-		} catch (Exception e) {
-			return false;
-		}
-
-		Utility.Location l = Utility.getLocation(node);
-		int nodeOffset = (l != null ? l.getLow() : 0); // 728
-		int nodeEndset = (l != null ? l.getHigh() : 0); // 745
-		if (traceOn)
-			System.out.println("node: " + node.getRawSignature() + " nodeOffset: " + nodeOffset + " nodeEndset= " + nodeEndset);
-
-		int pOffset = pragma_.getLocalOffset(); // 822
-		int pEndset = pOffset + pragma_.getLength() - 1; // 864
-		if (traceOn)
-			System.out.println(("pragma pOffset= " + pOffset + " pEndset= " + pEndset));
-
-		boolean tf = ((nodeEndset < pOffset || pEndset < nodeOffset) ? false : true); // false
-		if (!tf)
-			return tf;
-
-		// See if the declaration succeeds the pragma
-		Utility.Location dl = Utility.getLocation(symbol.getDeclarator());
-		if (dl == null)
-			return false;
-		if (traceOn)
-			System.out.println("dl.getLow()=" + dl.getLow() + " pOffset=" + pOffset + " > is: " + (dl.getLow() > pOffset));
-
-		return (dl.getLow() > pOffset ? false : true);
-	}
-
-	/**
-	 * Acquire the next token
-	 * 
-	 * @return OpenMPToken
-	 */
-	protected OpenMPToken nextToken() {
-		// Following in case of backup
-		if (token_ != null && token_.getNext() != null) {
-			token_ = token_.getNext();
-			return token_;
-		}
-
-		// chain to last one and move on
-		OpenMPToken token = scanner_.nextToken();
-		if (token_ != null)
-			token_.setNext(token);
-		token_ = token;
-		return token_;
-	}
-
-	/**
-	 * Get current token so as to mark (in code) where we were
-	 * 
-	 * @return OpenMPToken
-	 */
-	protected OpenMPToken mark() {
-		if (token_ == null)
-			token_ = nextToken();
-		return token_;
-	}
-
-	/**
-	 * Reset token queue (nextToken() get one after this one)
-	 * 
-	 * @param token
-	 */
-	protected void backupTo(OpenMPToken token) {
-		token_ = token;
-	}
-
-	/**
-	 * Test the parser
-	 * 
-	 */
-	private void readTokens() {
-		OpenMPScanner scanner = new OpenMPScanner(pragma_.getContent());
-
-		OpenMPToken token = null;
-		do {
-			token = scanner.nextToken();
-			if (token != null)
-				System.out.println("Token:" + token.getImage() + " type=" + token.getType());
-		} while (token != null);
-	}
-
-	/**
-	 * Complete the parsing of #pragma omp parallel
-	 * 
-	 */
-	private void completeParallel() {
-		boolean bShared = false;
-		boolean bPrivate = false;
-		boolean bFirstPrivate = false;
-		boolean bDefault = false;
-		boolean bReduction = false;
-		boolean bCopyin = false;
-		boolean bIf = false;
-		boolean bNumthreads = false;
-
-		while (token_ != null) {
-			switch (token_.getType()) {
-			case OpenMPScanner.mpShared:
-				if (!bShared)
-					bShared = setShared();
-				break;
-			case OpenMPScanner.mpPrivate:
-				if (!bPrivate)
-					bPrivate = setPrivate();
-				break;
-			case OpenMPScanner.mpFirstprivate:
-				if (!bFirstPrivate)
-					bFirstPrivate = setFirstPrivate();
-				break;
-			case OpenMPScanner.mpDefault:
-				if (!bDefault)
-					bDefault = setDefault();
-				break;
-			case OpenMPScanner.mpReduction:
-				if (!bReduction)
-					bReduction = setReduction();
-				break;
-			case OpenMPScanner.mpCopyin:
-				if (!bCopyin)
-					bCopyin = setCopyin();
-				break;
-			case OpenMPScanner.mpIf:
-				if (!bIf)
-					bIf = setIf();
-				break;
-			case OpenMPScanner.mpNumthreads:
-				if (!bNumthreads)
-					bNumthreads = setNumThreads();
-				break;
-			default:
-				handleProblem("Unexpected token " + token_.getImage(), OpenMPError.ERROR);
-				nextToken();
-				break;
-			}
-		}
-	}
-
-	/**
-	 * Complete parsing #paragma omp for
-	 * 
-	 */
-	private void completeFor() {
-		boolean bPrivate = false;
-		boolean bFirstPrivate = false;
-		boolean bLastPrivate = false;
-		boolean bReduction = false;
-		boolean bOrdered = false;
-		boolean bSchedule = false;
-		boolean bNowait = false;
-
-		while (token_ != null) {
-			switch (token_.getType()) {
-			case OpenMPScanner.mpPrivate:
-				if (!bPrivate)
-					bPrivate = setPrivate();
-				break;
-			case OpenMPScanner.mpFirstprivate:
-				if (!bFirstPrivate)
-					bFirstPrivate = setFirstPrivate();
-				break;
-			case OpenMPScanner.mpLastprivate:
-				if (!bLastPrivate)
-					bLastPrivate = setLastPrivate();
-				break;
-			case OpenMPScanner.mpReduction:
-				if (!bReduction)
-					bReduction = setReduction();
-				break;
-			case OpenMPScanner.mpOrdered:
-				if (!bOrdered) {
-					ompPragma_.setOrdered(true);
-					bOrdered = true;
-				}
-				nextToken();
-				break;
-			case OpenMPScanner.mpSchedule:
-				if (!bSchedule)
-					bSchedule = setSchedule();
-				break;
-			case OpenMPScanner.mpNowait:
-				if (!bNowait) {
-					ompPragma_.setNoWait(true);
-					bNowait = true;
-				}
-				nextToken();
-				break;
-			default:
-				handleProblem("Unexpected token " + token_.getImage(), OpenMPError.ERROR);
-				nextToken();
-				break;
-			}
-		}
-	}
-
-	/**
-	 * Complete parsing #paragma omp parallel for
-	 * 
-	 */
-	private void completeParallelFor() {
-		boolean bShared = false;
-		boolean bPrivate = false;
-		boolean bFirstPrivate = false;
-		boolean bLastPrivate = false;
-		boolean bDefault = false;
-		boolean bReduction = false;
-		boolean bCopyin = false;
-		boolean bIf = false;
-		boolean bOrdered = false;
-		boolean bSchedule = false;
-
-		while (token_ != null) {
-			switch (token_.getType()) {
-			case OpenMPScanner.mpShared:
-				if (!bShared)
-					bShared = setShared();
-				break;
-			case OpenMPScanner.mpPrivate:
-				if (!bPrivate)
-					bPrivate = setPrivate();
-				break;
-			case OpenMPScanner.mpFirstprivate:
-				if (!bFirstPrivate)
-					bFirstPrivate = setFirstPrivate();
-				break;
-			case OpenMPScanner.mpLastprivate:
-				if (!bLastPrivate)
-					bLastPrivate = setLastPrivate();
-				break;
-			case OpenMPScanner.mpDefault:
-				if (!bDefault)
-					bDefault = setDefault();
-				break;
-			case OpenMPScanner.mpReduction:
-				if (!bReduction)
-					bReduction = setReduction();
-				break;
-			case OpenMPScanner.mpCopyin:
-				if (!bCopyin)
-					bCopyin = setCopyin();
-				break;
-			case OpenMPScanner.mpIf:
-				if (!bIf)
-					bIf = setIf();
-				break;
-			case OpenMPScanner.mpOrdered:
-				if (!bOrdered) {
-					ompPragma_.setOrdered(true);
-					bOrdered = true;
-				}
-				nextToken();
-				break;
-			case OpenMPScanner.mpSchedule:
-				if (!bSchedule)
-					bSchedule = setSchedule();
-				break;
-			default:
-				handleProblem("Unexpected token " + token_.getImage(), OpenMPError.ERROR);
-				nextToken();
-				break;
-			}
-		}
-	}
-
-	/**
-	 * Complete parsing #pragma omp parallel sections
-	 * 
-	 */
-	private void completeParallelSections() {
-		boolean bShared = false;
-		boolean bPrivate = false;
-		boolean bFirstPrivate = false;
-		boolean bLastPrivate = false;
-		boolean bDefault = false;
-		boolean bReduction = false;
-		boolean bCopyin = false;
-		boolean bIf = false;
-
-		while (token_ != null) {
-			switch (token_.getType()) {
-			case OpenMPScanner.mpShared:
-				if (!bShared)
-					bShared = setShared();
-				break;
-			case OpenMPScanner.mpPrivate:
-				if (!bPrivate)
-					bPrivate = setPrivate();
-				break;
-			case OpenMPScanner.mpFirstprivate:
-				if (!bFirstPrivate)
-					bFirstPrivate = setFirstPrivate();
-				break;
-			case OpenMPScanner.mpLastprivate:
-				if (!bLastPrivate)
-					bLastPrivate = setLastPrivate();
-				break;
-			case OpenMPScanner.mpDefault:
-				if (!bDefault)
-					bDefault = setDefault();
-				break;
-			case OpenMPScanner.mpReduction:
-				if (!bReduction)
-					bReduction = setReduction();
-				break;
-			case OpenMPScanner.mpCopyin:
-				if (!bCopyin)
-					bCopyin = setCopyin();
-				break;
-			case OpenMPScanner.mpIf:
-				if (!bIf)
-					bIf = setIf();
-				break;
-			default:
-				handleProblem("Unexpected token " + token_.getImage(), OpenMPError.ERROR);
-				nextToken();
-				break;
-			}
-		}
-	}
-
-	/**
-	 * Complete parse of #pragma omp sections
-	 * 
-	 */
-	private void completeSections() {
-		boolean bPrivate = false;
-		boolean bFirstPrivate = false;
-		boolean bLastPrivate = false;
-		boolean bReduction = false;
-		boolean bNowait = false;
-
-		while (token_ != null) {
-			switch (token_.getType()) {
-			case OpenMPScanner.mpPrivate:
-				if (!bPrivate)
-					bPrivate = setPrivate();
-				break;
-			case OpenMPScanner.mpFirstprivate:
-				if (!bFirstPrivate)
-					bFirstPrivate = setFirstPrivate();
-				break;
-			case OpenMPScanner.mpLastprivate:
-				if (!bLastPrivate)
-					bLastPrivate = setLastPrivate();
-				break;
-			case OpenMPScanner.mpReduction:
-				if (!bReduction)
-					bReduction = setReduction();
-				break;
-			case OpenMPScanner.mpNowait:
-				if (!bNowait) {
-					ompPragma_.setNoWait(true);
-					bNowait = true;
-				}
-				nextToken();
-				break;
-			default:
-				handleProblem("Unexpected token " + token_.getImage(), OpenMPError.ERROR);
-				nextToken();
-				break;
-			}
-		}
-
-	}
-
-	/**
-	 * Complete options for the #pragma omp single
-	 * 
-	 */
-	private void completeSingle() {
-		boolean bPrivate = false;
-		boolean bFirstPrivate = false;
-		boolean bCopyPrivate = false;
-		boolean bNowait = false;
-
-		while (token_ != null) {
-			switch (token_.getType()) {
-			case OpenMPScanner.mpPrivate:
-				if (!bPrivate)
-					bPrivate = setPrivate();
-				break;
-			case OpenMPScanner.mpFirstprivate:
-				if (!bFirstPrivate)
-					bFirstPrivate = setFirstPrivate();
-				break;
-			case OpenMPScanner.mpCopyprivate:
-				if (!bCopyPrivate)
-					bCopyPrivate = setCopyPrivate();
-				break;
-			case OpenMPScanner.mpNowait:
-				if (!bNowait) {
-					ompPragma_.setNoWait(true);
-					bNowait = true;
-				}
-				nextToken();
-				break;
-			default:
-				handleProblem("Unexpected token " + token_.getImage(), OpenMPError.ERROR);
-				nextToken();
-				break;
-			}
-		}
-
-	}
-
-	/**
-	 * Complete the options for the #pragma omp flush
-	 * 
-	 */
-	private void completeFlush() {
-		if (token_ == null || token_.getType() != IToken.tLPAREN)
-			return;
-
-		OpenMPToken[] list = getIdentifierList();
-
-		ompPragma_.setPrivateList(list);
-	}
-
-	/**
-	 * Complete the options for the #pragma omp threadprivate
-	 * 
-	 */
-	private void completeThreadPrivate() {
-		if (token_ == null || token_.getType() != IToken.tLPAREN)
-			return;
-
-		OpenMPToken[] list = getIdentifierList();
-
-		ompPragma_.setThreadPrivateList(list);
-	}
-
-	/**
-	 * Translate the type of reduction operato
-	 * 
-	 * @return int (that PASTOMPPragma understands)
-	 */
-	private int getReductionOperator() {
-		switch (token_.getType()) {
-		case IToken.tPLUS:
-			return PASTOMPPragma.OmpOpPlus;
-		case IToken.tSTAR:
-			return PASTOMPPragma.OmpOpMult;
-		case IToken.tMINUS:
-			return PASTOMPPragma.OmpOpMinus;
-		case IToken.tAMPER:
-			return PASTOMPPragma.OmpOpBAnd;
-		case IToken.tXOR:
-			return PASTOMPPragma.OmpOpBXor;
-		case IToken.tBITOR:
-			return PASTOMPPragma.OmpOpBOr;
-		case IToken.tAND:
-			return PASTOMPPragma.OmpOpLAnd;
-		case IToken.tOR:
-			return PASTOMPPragma.OmpOpLOr;
-		default:
-			return PASTOMPPragma.OmpOpUnknown;
-		}
-	}
-
-	/**
-	 * Translate the kind of schedule
-	 * 
-	 * @return int (that PASTOMPPragma understands)
-	 */
-	private int getScheduleKind() {
-		switch (token_.getType()) {
-		case OpenMPScanner.mpStatic:
-			return PASTOMPPragma.OmpSKStatic;
-		case OpenMPScanner.mpDynamic:
-			return PASTOMPPragma.OmpSKDynamic;
-		case OpenMPScanner.mpGuided:
-			return PASTOMPPragma.OmpSKGuided;
-		case OpenMPScanner.mpRuntime:
-			return PASTOMPPragma.OmpSKRuntime;
-		default:
-			return PASTOMPPragma.OmpSKUnknown;
-		}
-	}
-
-	/**
-	 * Get the schedule expression
-	 * 
-	 * @return OpenMPToken []
-	 */
-	private OpenMPToken[] getExpression() {
-		LinkedList l = new LinkedList();
-		int parenCt = 1;
-
-		nextToken();
-		while (token_ != null) {
-			if (token_.getType() == IToken.tRPAREN) {
-				parenCt--;
-				if (parenCt == 0)
-					break;
-				else {
-					l.add(token_);
-				} // end of schedule clause
-			} else if (token_.getType() == IToken.tCOMMA) {
-				if (parenCt == 1)
-					break;
-				else
-					l.add(token_); // another way to exit
-			} else if (token_.getType() == IToken.tLPAREN) {
-				parenCt++;
-				l.add(token_);
-			} else
-				l.add(token_);
-			nextToken();
-		}
-
-		OpenMPToken[] list = new OpenMPToken[l.size()];
-		for (int i = 0; i < l.size(); i++)
-			list[i] = (OpenMPToken) l.get(i);
-
-		nextToken(); // move ahead
-		return list;
-	}
-
-	private boolean setIf() {
-		nextToken();
-		OpenMPToken[] list = getExpression();
-		ompPragma_.setIfExpression(list);
-		return true;
-	}
-
-	private boolean setPrivate() {
-		nextToken();
-		OpenMPToken[] list = getIdentifierList();
-		ompPragma_.setPrivateList(list);
-		return true;
-	}
-
-	private boolean setFirstPrivate() {
-		nextToken();
-		OpenMPToken[] list = getIdentifierList();
-		ompPragma_.setFirstPrivateList(list);
-		return true;
-	}
-
-	private boolean setLastPrivate() {
-		nextToken();
-		OpenMPToken[] list = getIdentifierList();
-		ompPragma_.setLastPrivateList(list);
-		return true;
-	}
-
-	private boolean setShared() {
-		nextToken();
-		OpenMPToken[] list = getIdentifierList();
-		ompPragma_.setSharedList(list);
-		return true;
-	}
-
-	private boolean setCopyin() {
-		nextToken();
-		OpenMPToken[] list = getIdentifierList();
-		ompPragma_.setCopyinList(list);
-		return true;
-	}
-
-	private boolean setCopyPrivate() {
-		nextToken();
-		OpenMPToken[] list = getIdentifierList();
-		ompPragma_.setCopyPrivateList(list);
-		return true;
-	}
-
-	private boolean setDefault() {
-		boolean shared = false;
-		nextToken();
-		if (token_.getType() == IToken.tLPAREN) {
-			nextToken();
-			if (token_.getType() == OpenMPScanner.mpShared)
-				shared = true;
-			else if (token_.getType() == OpenMPScanner.mpNone)
-				shared = false;
-			else
-				return false;
-			nextToken(); // get the paren
-			if (token_ == null || token_.getType() != IToken.tRPAREN)
-				return false;
-			ompPragma_.setDefault(shared ? PASTOMPPragma.OmpShared : PASTOMPPragma.OmpNone);
-			nextToken();
-			return true;
-		}
-		return false;
-	}
-
-	private boolean setReduction() {
-		nextToken();
-		if (token_.getType() == IToken.tLPAREN) {
-			nextToken();
-			int ro = getReductionOperator();
-			nextToken();
-			if (token_ != null && token_.getType() == IToken.tCOLON) {
-				OpenMPToken[] rlist = getIdentifierList();
-				ompPragma_.setReductionOperator(ro);
-				ompPragma_.setReductionList(rlist);
-				return true;
-			}
-			return false;
-		}
-		return false;
-	}
-
-	private boolean setNumThreads() {
-		nextToken();
-		if (token_.getType() == IToken.tLPAREN) {
-			OpenMPToken[] expr = getExpression();
-			if (token_ == null || token_.getType() != IToken.tRPAREN)
-				return false;
-			ompPragma_.setNumThreadsExpr(expr);
-			return true;
-		}
-		return false;
-	}
-
-	private boolean setSchedule() {
-		nextToken();
-		if (token_.getType() == IToken.tLPAREN) {
-			nextToken();
-			int kind = getScheduleKind();
-			nextToken();
-			if (token_ != null && token_.getType() == IToken.tCOMMA) {
-				OpenMPToken[] expr = getExpression();
-				ompPragma_.setScheduleKind(kind);
-				ompPragma_.setChunkExpression(expr);
-				return true;
-			}
-			return false;
-		}
-		return false;
-	}
-
-	// We are presently unsure of what to do with all the following stuff:
-	// protected static final ScannerProblemFactory spf = new
-	// ScannerProblemFactory();
-	// protected ScannerCallbackManager callbackManager;
-	// protected static char[] EMPTY_CHAR_ARRAY = new char[0];
-	//
-	// protected void otherinit(ISourceElementRequestor requestor)
-	// {
-	// callbackManager = new ScannerCallbackManager(new
-	// NullSourceElementRequestor());
-	// }
-
-	/**
-	 * handleProblem
-	 * 
-	 * @param description
-	 *            - String
-	 * @param severity
-	 *            - int
-	 */
-	protected void handleProblem(String description, int severity) {
-		OpenMPError error = new OpenMPError(description, pragma_.getContainingFilename(), pragma_.getStartingLine(), severity);
-		OpenMPErrorManager.getCurrentErrorManager().addError(error);
-		ompPragma_.addProblem(error); // we really don't need this, but may be
-										// useful later
-	}
-
-	/**
-	 * lFind the associated region to the current pragma
-	 * 
-	 */
-	private void locateRegion() {
-		if (ompPragma_ == null)
-			return;
-
-		switch (ompPragma_.getOMPType()) {
-		// followed by structured region
-		case PASTOMPPragma.OmpParallel:
-		case PASTOMPPragma.OmpSections:
-		case PASTOMPPragma.OmpSection:
-		case PASTOMPPragma.OmpParallelSections:
-		case PASTOMPPragma.OmpSingle:
-		case PASTOMPPragma.OmpMaster:
-		case PASTOMPPragma.OmpCritical:
-		case PASTOMPPragma.OmpOrdered:
-			determineRegion(STRUCTURED_BLOCK, ompPragma_);
-			break;
-
-		// Must be followed by FOR
-		case PASTOMPPragma.OmpFor:
-		case PASTOMPPragma.OmpParallelFor:
-			determineRegion(FOR_BLOCK, ompPragma_);
-			break;
-
-		// Stands alone
-		case PASTOMPPragma.OmpBarrier:
-		case PASTOMPPragma.OmpFlush:
-		case PASTOMPPragma.OmpThreadPrivate:
-			determineRegion(LOCATION_ONLY, ompPragma_);
-			break;
-
-		// Followed by expression
-		case PASTOMPPragma.OmpAtomic:
-			determineRegion(EXPRESSION_BLOCK, ompPragma_);
-			break;
-		case PASTOMPPragma.OmpUnknown:
-			break;
-		}
-	}
-
-	public static final int STRUCTURED_BLOCK = RegionDeterminationVisitor.STRUCTURED_BLOCK;
-	public static final int FOR_BLOCK = RegionDeterminationVisitor.FOR_BLOCK;
-	public static final int EXPRESSION_BLOCK = RegionDeterminationVisitor.EXPRESSION_BLOCK;
-	public static final int LOCATION_ONLY = RegionDeterminationVisitor.LOCATION_ONLY;
-
-	/**
-	 * Determine that code region affiliated with a pragma & the peer node
-	 * 
-	 * @param type
-	 *            - int (see constants above)
-	 * @param ompPragma
-	 *            - PASTOMPPragma
-	 */
-	protected void determineRegion(int type, PASTOMPPragma ompPragma) {
-		RegionDeterminationVisitor rdv = new RegionDeterminationVisitor(type, ompPragma);
-		ast_.accept(rdv);
-
-		// Ensure that region for structured block is a compound statement
-		if (type == STRUCTURED_BLOCK) {
-			IASTNode region = ompPragma.getRegion();
-			if (region == null || !(region instanceof IASTCompoundStatement))
-				handleProblem("Pragma expects structured block to follow it", OpenMPError.ERROR);
-		} else if (type == FOR_BLOCK) {
-			IASTNode region = ompPragma.getRegion();
-			if (region == null || !(region instanceof IASTForStatement))
-				handleProblem("Pragma expects for loop to follow it", OpenMPError.ERROR);
-		}
-	}
-
-	/**
-	 * RegionDeterminationVisitor is used to traverse AST to find region
-	 */
-	protected class RegionDeterminationVisitor extends ASTVisitor {
-		protected int searchType_ = STRUCTURED_BLOCK;
-		protected PASTOMPPragma oPragma_ = null;
-		protected int pragmaLine_ = 0;
-		protected int pragmaLocation_ = 0;
-		protected int pragmaLength_ = 0;
-
-		protected int closeness_ = -1;
-
-		// for statement location
-		// protected IASTStatement lastStatement_ = null;
-
-		public final static int STRUCTURED_BLOCK = 0;
-		public final static int FOR_BLOCK = 1;
-		public final static int EXPRESSION_BLOCK = 2;
-		public final static int LOCATION_ONLY = 3; // tell me what immediately
-													// precedes
-
-		public RegionDeterminationVisitor(int type, PASTOMPPragma ompPragma) {
-			searchType_ = type;
-			switch (searchType_) {
-			case STRUCTURED_BLOCK:
-				shouldVisitStatements = true;
-				break;
-			case FOR_BLOCK:
-				shouldVisitStatements = true;
-				break;
-			case EXPRESSION_BLOCK:
-				shouldVisitStatements = true; // we want an expression statement
-				break;
-			case LOCATION_ONLY:
-				shouldVisitStatements = true;
-				break;
-			}
-
-			oPragma_ = ompPragma;
-			pragmaLine_ = oPragma_.getStartingLine();
-			pragmaLocation_ = oPragma_.getOffset(); // oPragma_.getStartLocation();
-			pragmaLength_ = oPragma_.getLength();
-		}
-
-		/**
-		 * override function to visit statements implementation NOTE: Region is
-		 * first statement following pragma
-		 * 
-		 * @param statement
-		 *            - IASTStatement
-		 * @return int
-		 */
-		@Override
-		@SuppressWarnings("restriction")
-		// remove later
-		public int visit(IASTStatement statement) { // BRT debugging here.
-													// region is being set
-													// wrong, needs to be
-													// drilled down more
-			ASTNode node = (statement instanceof ASTNode ? (ASTNode) statement : null);
-			if (node == null)
-				return PROCESS_CONTINUE;
-
-			// ensure the node is in the same file as the pragma
-			if (node.getContainingFilename().equals(oPragma_.getFileLocation().getFileName())) {
-				int totalOffset = node.getOffset();
-				// test use of IASTNode vs ASTNode. compare with
-				// Utility.getLocation which uses a combination of the two
-				IASTNode inode = node;
-				if (traceOn) {
-					int ilen = inode.getNodeLocations()[0].getNodeLength();
-					int ioff = inode.getNodeLocations()[0].getNodeOffset();
-					System.out.println("    ilen=" + ilen + " ioff=" + ioff);
-				}
-
-				Utility.Location loc = Utility.getLocation(node);
-				assert (loc != null);
-				int localOffset = loc.getLow(); // this is the offset local to
-												// the file
-				int length = loc.getHigh() - loc.getLow() + 1;
-
-				// We look at all nodes that occur before the pragma - 2 cases
-				// 1) if the node scope encompases the pragma, pragma is a child
-				// of node
-				// 2) otherwise we call it a peer (even when it isn't)
-				// Corrections occur by continuing for the tightest fit
-				// // https://bugs.eclipse.org/bugs/show_bug.cgi?id=253200 fixed
-				// (see PASTPragma.getOffset(); this println helps, should be
-				// called several times as it zeroes in on the statement closest
-				// to the pragma
-				if (traceOn)
-					System.out.println("totalOffset " + totalOffset + " < pragmaLocation " + pragmaLocation_);// from
-																												// ptp20
-				if (totalOffset < pragmaLocation_) {
-					if (pragmaLocation_ + pragmaLength_ < totalOffset + length) { // encompassing
-						oPragma_.setLocation(statement, PASTOMPPragma.ChildProximity);
-					} else {
-						if (totalOffset + length < pragmaLocation_) {
-							int closeness = pragmaLocation_ - (totalOffset + length);
-							if (closeness_ == -1 || closeness < closeness_) { // get
-																				// closest
-																				// statement
-								oPragma_.setLocation(statement, PASTOMPPragma.NeighborProximity);
-								closeness_ = closeness;
-							}
-						}
-					}
-					// keep going to find tightest fit
-				}
-
-				// Check if this is the first node after the pragma - if so,
-				// could be our region
-				if (totalOffset > pragmaLocation_) {
-					if (searchType_ != LOCATION_ONLY) {
-						// With this we got to the next stmt:
-						if (searchType_ == FOR_BLOCK && !(statement instanceof IASTForStatement))
-							return PROCESS_ABORT; // error handled in
-													// determineRegion
-						// Set region information (ref. OpenMPArtifactView to
-						// see how used)
-						oPragma_.setRegionFilename(node.getContainingFilename());
-						oPragma_.setRegionLength(length);
-						oPragma_.setRegionOffset(localOffset);
-						oPragma_.setRegion(statement);
-						if (traceOn)
-							System.out.println((searchType_ == FOR_BLOCK ? "(for)" : "(region)") + "pragma at " + pragmaLocation_
-									+ " has statement at " + localOffset);
-					}
-					return PROCESS_ABORT;
-				}
-			}
-			return PROCESS_CONTINUE;
-		}
-
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTOMPPragma.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTOMPPragma.java
deleted file mode 100644
index f59e8ca..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTOMPPragma.java
+++ /dev/null

@@ -1,379 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.PAST;
-
-import java.util.LinkedList;
-
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorPragmaStatement;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.ptp.pldt.openmp.analysis.OpenMPError;
-import org.eclipse.ptp.pldt.openmp.analysis.parser.OpenMPToken;
-
-/**
- * 
- * @author pazel
- *
- */
-public class PASTOMPPragma extends PASTPragma
-{
-    protected int ompType_ = OmpUnknown;
-    
-    // OmpParallel, OmpParallelFor, OmpParallelSections
-    protected OpenMPToken [] sharedList_        = null;
-    // OmpParallel, OmpFor, OmpSections, OmpSingle, OmpParallelFor, OmpParallelSections
-    protected OpenMPToken [] privateList_       = null;
-    // OmpParallel, OmpFor, OmpSections, OmpSingle, OmpParallelFor, OmpParallelSections
-    protected OpenMPToken [] firstPrivateList_  = null;
-    // OmpFor, OmpSections, OmpParallelFor, OmpParallelSections
-    protected OpenMPToken [] lastPrivateList_   = null;
-    // OmpParallel, OmpParallelFor, OmpParallelSections
-    protected int            default_           = OmpShared;  // or OmpNone
-    // OmpParallel, OmpFor, OmpSections, OmpParallelFor, OmpParallelSections
-    protected int            reductionOperator_ = OmpOpUnknown;
-    protected OpenMPToken [] reductionList_     = null;
-    // OmpParallel, OmpParallelFor, OmpParallelSections
-    protected OpenMPToken [] copyinList_        = null;
-    // OmpParallel, OmpParallelFor, OmpParallelSections
-    protected OpenMPToken [] ifExpression_            = null;
-    // OmpFor, OmpParallelFor
-    protected boolean        ordered_           = false;
-    // OmpFor, OmpParallelFor
-    protected int            scheduleKind_      = OmpSKUnknown;
-    protected OpenMPToken [] chunkExpression_   = null;
-    // OmpFor, OmpSections, OmpSingle
-    protected boolean        nowait_            = false;
-
-    // OmpThreadPrivate
-    protected OpenMPToken [] threadPrivateList_ = null;
-    // OmpParallel
-    protected OpenMPToken [] numThreadsExpr_    = null;
-    // OmpSingle
-    protected OpenMPToken [] copyPrivateList_   = null;
-    // OmpFlush
-    protected OpenMPToken [] flushList_         = null;
-    // Region
-    protected IASTNode      region_  = null;
-    protected String        regionFilename_ = null;
-    protected int           regionOffset_   = 0;     // local to file (not acctg for includes)
-    protected int           regionLength_   = 0;
-    // Problem list for this omp pragma
-    protected LinkedList    problemList_  = new LinkedList();  // of OpenMPError's
-    
-    protected IASTStatement locationNode_ = null;   // just preceding stmt - if cmpd stmt
-    protected int           locationProximity_ = NoProximity;
-    
-    public static final int NoProximity       = -1;
-    public static final int NeighborProximity = 0;  // cst indicating pragma at same level and succeeding pragma
-    public static final int ChildProximity    = 1;  // cst indicating pragma is child of ast node
-
-    
-    public static final int OmpUnknown  = -1;
-    public static final int OmpParallel = 0;
-    public static final int OmpFor      = 1;
-    public static final int OmpSection  = 2;
-    public static final int OmpSections = 3;
-    public static final int OmpSingle   = 4;
-    public static final int OmpParallelFor      = 5;
-    public static final int OmpParallelSections = 6;
-    public static final int OmpMaster   = 7;
-    public static final int OmpCritical = 8;
-    public static final int OmpBarrier  = 9;
-    public static final int OmpAtomic   = 10;
-    public static final int OmpFlush    = 11;
-    public static final int OmpOrdered  = 12;
-    public static final int OmpThreadPrivate = 13;
-    
-    public static final int OmpShared   = 0;
-    public static final int OmpNone     = 1;
-    
-    public static final int OmpOpUnknown = -1;
-    public static final int OmpOpPlus    = 0;
-    public static final int OmpOpMult    = 1;
-    public static final int OmpOpMinus   = 2;
-    public static final int OmpOpBAnd    = 3;
-    public static final int OmpOpBXor    = 4;
-    public static final int OmpOpBOr     = 5;
-    public static final int OmpOpLAnd    = 6;
-    public static final int OmpOpLOr     = 7;
-    
-    public static final int OmpSKUnknown = -1;
-    public static final int OmpSKStatic  = 0;
-    public static final int OmpSKDynamic = 1;
-    public static final int OmpSKGuided  = 2;
-    public static final int OmpSKRuntime = 3;
-	
-    /**
-     * PASTOMPPragma - constructor using ASTPragma
-     * @param pragma - ASTPragma
-     */
-	public PASTOMPPragma(IASTPreprocessorPragmaStatement pragma)
-	{
-		super(pragma);
-		//pragma_ = pragma;
-	}
-    
-    /**
-     * PASTOMPPragma - constructor using PASTPragma
-     * @param pragma - PASTPragma
-     */
-    public PASTOMPPragma(PASTPragma pragma)
-    {
-        super(pragma);
-    }
-    
-    public String getType()
-    {
-        String t = "";
-        switch(ompType_) {
-            case OmpUnknown:
-                t="--unknown==";
-                break;
-            case OmpParallel:
-                t="parallel";
-                break;
-            case OmpFor:
-                t="for";
-                break;
-            case OmpSections:
-                t="sections";
-                break;
-            case OmpSection:
-                t="section";
-                break;
-            case OmpSingle:
-                t="single";
-                break;
-            case OmpParallelFor:
-                t="parallel for";
-                break;
-            case OmpParallelSections:
-                t="parallel sections";
-                break;
-            case OmpMaster:
-                t="master";
-                break;
-            case OmpCritical:
-                t="critical";
-                break;
-            case OmpBarrier:
-                t="barrier";
-                break;
-            case OmpAtomic:
-                t="atomic";
-                break;
-            case OmpFlush:
-                t="flush";
-                break;
-            case OmpOrdered:
-                t="ordered";
-                break;
-            case OmpThreadPrivate:
-                t="thread private";
-                break;
-        }
-        return "#pragma omp "+t;
-    }
-    
-    /**
-     * getOMPType - get the type code for the OpenMP directive
-     * @return
-     */
-    public int getOMPType()
-    {
-        return ompType_;
-    }
-    
-    public OpenMPToken [] getThreadPrivateList()
-    {
-        return threadPrivateList_;
-    }
-    
-    public OpenMPToken [] getIfExpression()
-    {
-        return ifExpression_;
-    }
-    
-    public OpenMPToken [] getPrivateList()
-    {
-        return privateList_;
-    }
-    
-    public OpenMPToken [] getFirstPrivateList()
-    {
-        return firstPrivateList_;
-    }
-    
-    public int getDefault()
-    {
-        return default_;
-    }
-    
-    public OpenMPToken [] getSharedList()
-    {
-        return sharedList_;
-    }
-
-    
-    public OpenMPToken [] getCopyinList()
-    {
-        return copyinList_;
-    }
-    
-    public int getReductionOperator()
-    {
-        return reductionOperator_;
-    }
-    
-    public OpenMPToken [] getReductionList()
-    {
-        return reductionList_;
-    }
-    
-    public boolean getOrdered()
-    {
-        return ordered_;
-    }
-    
-    public boolean getNoWait()
-    {
-        return nowait_;
-    }
-    
-    public int getScheduleKind()
-    {
-        return scheduleKind_;
-    }
-    
-    public OpenMPToken [] getChunkExpression()
-    {
-        return chunkExpression_;
-    }
-    
-    public OpenMPToken [] getCopyPrivateList()
-    {
-        return copyPrivateList_;
-    }
-    
-    public OpenMPToken [] getFlushList()
-    {
-        return flushList_;
-    }
-    
-    public OpenMPToken [] getNumThreadsExpr()
-    {
-        return numThreadsExpr_;
-    }
-    
-    public OpenMPToken [] getLastPrivateList()
-    {
-        return lastPrivateList_;
-    }
-    
-    /**
-     * getRegion - accessor
-     * @return IASTNode
-     */
-    public IASTNode getRegion()
-    {
-        return region_;
-    }
-    
-    public String getRegionFilename()
-    { return regionFilename_; }
-    
-    public int getRegionOffset()
-    {
-        return regionOffset_;
-    }
-    
-    public int getRegionLength()
-    {
-        return regionLength_;
-    }
-    
-    public LinkedList getProblems()
-    {
-        return problemList_;
-    }
-    
-    public IASTStatement getLocation()
-    {
-        return locationNode_;
-    }
-
-    public int getProximity()
-    {
-        return locationProximity_;
-    }
-    
-    /**
-     * setOMPType - set the OMP type code
-     * @param type
-     */
-    protected void setOMPType(int type) { ompType_ = type; }
-    
-    /**
-     * setThreadPrivateList - set the threadprivate list of variables
-     * @param l
-     */
-    protected void setThreadPrivateList(OpenMPToken [] l) { threadPrivateList_ = l; }
-
-    protected void setIfExpression(OpenMPToken [] l) { ifExpression_ = l; }
-    
-    protected void setPrivateList(OpenMPToken [] l) { privateList_ = l; }
-    
-    protected void setFirstPrivateList(OpenMPToken [] l) { firstPrivateList_ = l; }
-    
-    protected void setDefault(int sn) { default_ = sn; }
-    
-    protected void setSharedList(OpenMPToken [] l) { sharedList_ = l; }
-    
-    protected void setCopyinList(OpenMPToken [] l) { copyinList_ = l; }
-    
-    protected void setReductionOperator(int op) { reductionOperator_ = op; }
-
-    protected void setReductionList(OpenMPToken [] l) { reductionList_ = l; }
-    
-    protected void setOrdered(boolean tf) { ordered_ = tf; }
-    
-    protected void setNoWait(boolean tf) { nowait_ = tf; }
-    
-    protected void setScheduleKind(int kind) { scheduleKind_ = kind; }
-    
-    protected void setChunkExpression(OpenMPToken [] expression) { chunkExpression_ = expression; }
-    
-    protected void setCopyPrivateList(OpenMPToken [] l) { copyPrivateList_ = l; }
-    
-    protected void setFlushList(OpenMPToken [] l) { flushList_ = l; }
-    
-    protected void setNumThreadsExpr(OpenMPToken [] l) { numThreadsExpr_ = l; }
-    
-    protected void setLastPrivateList(OpenMPToken [] l) { lastPrivateList_ = l; }
-    
-    protected void setRegion(IASTNode region) { region_ = region;  }
-    
-    protected void setRegionFilename(String filename) { regionFilename_ = filename; }
-    
-    protected void setRegionOffset(int offset)  { regionOffset_ = offset;  }
-    
-    protected void setRegionLength(int length)  { regionLength_ = length;  }
-    
-    public void addProblem(OpenMPError error)
-    { problemList_.add(error); }
-
-    public void setLocation(IASTStatement location, int proximity) 
-    { locationNode_=location;   locationProximity_=proximity;  }
-    
-    public String toString() {
-    	return "PASTOMPPragma: "+getType()+" offset: "+regionOffset_+"  length: "+regionLength_;
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTObjectMacro.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTObjectMacro.java
deleted file mode 100644
index 8c7b6b3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTObjectMacro.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorObjectStyleMacroDefinition;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-
-/**
- * 
- * @author  pazel
- *
- */
-public class PASTObjectMacro extends PASTNode implements IASTPreprocessorObjectStyleMacroDefinition
-{
-    protected IASTPreprocessorObjectStyleMacroDefinition objMacro_ = null;
-    
-    /**
-     * PASTObjectMacro - constructor
-     * @param objMacro: ASTObjectMacro
-     */
-    public PASTObjectMacro(IASTPreprocessorObjectStyleMacroDefinition objMacro)
-    {
-        super((ASTNode)objMacro);
-        objMacro_ = objMacro;
-    }
-    
-    public String getType()
-    {
-        return "#define";
-    }
-
-    /**
-     * Delegated methods for interface IASTPreprocessorObjectStyleMacroDefinition
-     */
-    public int getRoleForName(IASTName n)
-    {
-        return objMacro_.getRoleForName(n);
-    }
-
-    public String getExpansion()
-    {
-        return objMacro_.getExpansion();
-    }
-
-    public IASTName getName()
-    {
-        return objMacro_.getName();
-    }
-
-    public void setExpansion(String exp)
-    {
-        objMacro_.setExpansion(exp);        
-    }
-
-    public void setName(IASTName name)
-    {
-        objMacro_.setName(name);        
-    }
-
-	public IASTFileLocation getExpansionLocation() {
-		return objMacro_.getExpansionLocation();
-	}
-
-	public boolean isPartOfTranslationUnitFile() {
-		return objMacro_.isPartOfTranslationUnitFile();
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTPragma.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTPragma.java
deleted file mode 100644
index 4f7cfc6..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTPragma.java
+++ /dev/null

@@ -1,120 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006,2007 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.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorPragmaStatement;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-import org.eclipse.ptp.pldt.common.util.Utility;
-
-/**
- * Pseudo node for IAST pragma nodes
- * 
- * @author pazel
- * 
- */
-public class PASTPragma extends PASTNode implements IASTPreprocessorPragmaStatement {
-	protected IASTPreprocessorPragmaStatement pragma_ = null;
-	protected String content_ = "";
-
-	/**
-	 * PASTPragma - constructor
-	 * 
-	 * @param pragma
-	 */
-	public PASTPragma(IASTPreprocessorPragmaStatement pragma) {
-		super((ASTNode) pragma);
-		pragma_ = pragma;
-	}
-
-	/**
-	 * PASTPragma - Copy constructor
-	 * 
-	 * @param pPragma
-	 *            : PASTPragma
-	 */
-	public PASTPragma(PASTPragma pPragma) {
-		super(pPragma);
-		pragma_ = pPragma.getASTPragma();
-		content_ = pPragma.getContent();
-	}
-
-	protected IASTPreprocessorPragmaStatement getASTPragma() {
-		return pragma_;
-	}
-
-	@Override
-	public String getType() {
-		return "#pragma";
-	}
-
-	/**
-	 * Is this the pragma statement itself, or the state to which it implies?
-	 * (immediately following, "scope" of pragma)
-	 * 
-	 * @return
-	 */
-	public String getContent() {
-		// return pragma_.getContent();
-		return content_;
-	}
-
-	/**
-	 * getOffset - relative to the AST, i.e. include files factored into offset
-	 * 
-	 * @return int
-	 */
-	public int getOffset() {
-		// return getStartLocation();
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=253200 fixed
-		return astNode_.getOffset();
-	}
-
-	/**
-	 * getLength - get the length of the pragma
-	 * 
-	 * @return int
-	 */
-	public int getLength() {
-		return getEndLocation() - getStartLocation();
-	}
-
-	/**
-	 * getLocalOffset - relative to containing file, i.e. include files factored
-	 * out offset
-	 * 
-	 * @return int
-	 */
-	public int getLocalOffset() {
-		Utility.Location l = Utility.getLocation(pragma_);
-		return l.low_;
-	}
-
-	public void setContent(String content) {
-		content_ = content;
-	}
-
-	public char[] getMessage() {
-		return pragma_.getMessage();
-	}
-
-	public boolean isPartOfTranslationUnitFile() {
-		return pragma_.isPartOfTranslationUnitFile();
-	}
-
-	/**
-	 * @since 4.0
-	 */
-	public boolean isPragmaOperator() {
-		return pragma_.isPragmaOperator();
-
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTUndef.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTUndef.java
deleted file mode 100644
index 13cc242..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/PAST/PASTUndef.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.PAST;
-
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorUndefStatement;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-
-/**
- * 
- * @author pazel
- *
- */
-public class PASTUndef extends PASTNode implements IASTPreprocessorUndefStatement
-{
-	protected IASTPreprocessorUndefStatement undef_ = null;
-	
-    /**
-     * PASTUndef - constructor
-     * @param undef
-     */
-	public PASTUndef(IASTPreprocessorUndefStatement undef)
-	{
-		super((ASTNode)undef);
-		undef_ = undef;
-	}
-    
-    public String getType()
-    {
-        return "#undef";
-    }
-
-    /**
-     * Delegate methods for IASTPreprocessorUndefStatement 
-     */
-	public IASTName getMacroName() {
-		return undef_.getMacroName();
-	}
-
-	public boolean isPartOfTranslationUnitFile() {
-		return undef_.isPartOfTranslationUnitFile();
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/dictionary/Dictionary.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/dictionary/Dictionary.java
deleted file mode 100644
index 7982900..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/dictionary/Dictionary.java
+++ /dev/null

@@ -1,231 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006,2007 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.analysis.dictionary;
-import java.util.Hashtable;
-import java.util.LinkedList;
-
-import org.eclipse.cdt.core.dom.ast.DOMException;
-import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTParameterDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.ast.IBinding;
-import org.eclipse.cdt.core.dom.ast.IScope;
-
-
-/**
- * Dictionary for entire file - global scope and function scopes
- * <br>
- *  The dictionary is mainly used to query for symbols within certain scopes
- * and each symbol tells where it is defined, see getSymbolsFor().<br>
- * Would be good to develop further with "where used" information
- * 
- * @author pazel
- */
-public class Dictionary
-{
-    // maps string to linked list of symbols having the same name
-    protected Hashtable     textToSymbols_          = new Hashtable(); 
-    // maps function (or ast for globals) to linked list of all symbols defined in that function
-    protected Hashtable     functionToSymbols_      = new Hashtable(); 
-    
-    protected Hashtable     stringScopeKeyToSymbol_ = new Hashtable();
-    
-    protected IASTTranslationUnit   ast_ = null;
-    
-    /**
-     * Dictionary - File dictionary
-     * @param ast - IASTTranslationUnit
-     */
-    public Dictionary(IASTTranslationUnit ast)
-    {
-        ast_ = ast;
-        
-        functionToSymbols_.put(ast_, new LinkedList());
-    }
-    
-    /**
-     * insert - insert a set of symbol specifications using a simple declartion
-     * @param decl    - IASTSimpleDeclaration
-     */
-    public void insert(IASTSimpleDeclaration decl)
-    {
-        IASTDeclarator [] decls = decl.getDeclarators();
-        for(int i=0; i<decls.length; i++)
-            insert(decls[i], decl);
-    }
-    
-    /**
-     * insert - insert a declarator into the dictionaries
-     * @param declarator - IASTDeclarator
-     * @param decl       - IASTDeclaration
-     */
-    public void insert(IASTDeclarator declarator, IASTDeclaration decl){
-        Symbol symbol = new Symbol(declarator, decl);
-        insertMember(symbol);
-    }
-    
-    
-    /**
-     * insert - insert a declarator into the dictionaries
-     * @param declarator - IASTDeclarator
-     * @param decl       - IASTDeclaration
-     */
-    public void insert(IASTDeclarator declarator, IASTParameterDeclaration decl){
-        Symbol symbol = new Symbol(declarator, decl);
-        insertMember(symbol);
-    }
-
-    
-    protected void insertMember(Symbol symbol)
-    {
-        IASTNode node   = symbol.getDefiningFunction();
-        
-        // add to string/scope
-        try {
-          StringScopeKey sskey = new StringScopeKey(symbol.getName());
-          stringScopeKeyToSymbol_.put(sskey, symbol);
-        }
-        catch(DOMException e) {
-            System.out.println("Dictionary.insert exception "+e);
-        }
-        
-        // Add to function global lists
-        if (node==null) node = ast_;  // ?? maybe should exit instead??
-        LinkedList ll = (LinkedList)functionToSymbols_.get(node);
-        if (ll==null) {
-            ll = new LinkedList();
-            functionToSymbols_.put(node, ll);
-        }
-        ll.add(symbol);
-        
-        // Add to text list
-        String strname = symbol.getName().toString();
-        LinkedList nl = (LinkedList)textToSymbols_.get(strname);
-        if (nl==null) {
-            nl = new LinkedList();  // definitions for this text name
-            textToSymbols_.put(strname, nl);
-        }
-        nl.add(symbol);
-    }
-    
-    /**
-     * getSymbolsFor - for a name string, using the global dicationary
-     * @param text - String
-     * @return Symbol []
-     */
-    public Symbol [] getSymbolsFor(String text)
-    {
-        LinkedList ll = (LinkedList)textToSymbols_.get(text);
-        if (ll==null)  return new Symbol[0];
-        Symbol [] ans = new Symbol[ll.size()];
-        for(int i=0; i<ll.size(); i++)  ans[i] = (Symbol)ll.get(i);
-        return ans;
-    }
-    
-    /**
-     * getSymbolsFor - using a given function scope
-     * @param fctnDef - IASTFunctionDefinition
-     * @return Symbol []
-     */
-    public Symbol [] getSymbolsFor(IASTFunctionDefinition fctnDef)
-    {
-        LinkedList ll = (LinkedList)functionToSymbols_.get(fctnDef);
-        if (ll==null)  return new Symbol[0];
-        Symbol [] ans = new Symbol[ll.size()];
-        for(int i=0; i<ll.size(); i++)  ans[i] = (Symbol)ll.get(i);
-        return ans;
-    }
-    
-    /**
-     * getSymbolsFor - using the global scope
-     * @return Symbol []
-     */
-    public Symbol [] getSymbolsFor()
-    {
-        LinkedList ll = (LinkedList)functionToSymbols_.get(ast_);
-        if (ll==null)  return new Symbol[0];
-        Symbol [] ans = new Symbol[ll.size()];
-        for(int i=0; i<ll.size(); i++)  ans[i] = (Symbol)ll.get(i);
-        return ans;
-    }
-    
-    /**
-     * find - given an IASTName (references, for example)
-     * @param name - IASTName
-     * @return Symbol
-     * @throws DOMException
-     */
-    public Symbol find(IASTName name) throws DOMException
-    {
-        StringScopeKey key = new StringScopeKey(name);
-        
-        return (Symbol)stringScopeKeyToSymbol_.get(key);
-    }
-    
-    //-------------------------------------------------------------------------
-    // Class: StringScopeKey - binding identity of name and scope where defined
-    //-------------------------------------------------------------------------
-    protected static class StringScopeKey
-    {
-        public String stringKey_ = "";
-        public IScope scopeKey_ = null;
-        
-        public StringScopeKey(String stringKey, IScope scopeKey)
-        {
-            stringKey_ = stringKey;
-            scopeKey_  = scopeKey;
-        }
-        
-        public StringScopeKey(IASTName nameNode) throws DOMException
-        {
-            stringKey_ = nameNode.toString();
-            //IBinding b = nameNode.resolveBinding();
-            //if (b instanceof IVariable) {
-            //   IVariable biv = (IVariable)b; 
-            //   IType t = biv.getType();
-            //   t=null;
-            //}
-            IBinding binding=nameNode.resolveBinding();//cdt40 fix: was getBinding(); could have been null
-            scopeKey_ = binding.getScope();
-        }
-        
-        /**
-         * equals
-         *    NOTE - This is what makes the stringScopeKeyToSymbol_ hashtable work.
-         *           allowing two StringScopeKeys with identical data fields to be "identified"
-         *           by the hashtable.
-         */
-        public boolean equals(Object that) 
-        {
-            if ( this == that ) return true;
-            if ( !(that instanceof StringScopeKey) ) return false;
-            StringScopeKey thatStringScopeKey =  (StringScopeKey)that;
-            if (thatStringScopeKey.stringKey_.equals(stringKey_) && thatStringScopeKey.scopeKey_==scopeKey_)  return true;
-            return false;
-        }
-
-        /**
-         * equals
-         *    NOTE - This is what makes the stringScopeKeyToSymbol_ hashtable work
-         */
-        public int hashCode() {
-            return stringKey_.hashCode();
-        }
-
-
-    }
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/dictionary/DictionaryFactory.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/dictionary/DictionaryFactory.java
deleted file mode 100644
index e8a29cb..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/dictionary/DictionaryFactory.java
+++ /dev/null

@@ -1,102 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.dictionary;
-
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDeclarator;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
-import org.eclipse.cdt.core.dom.ast.IASTParameterDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTStandardFunctionDeclarator;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-
-/**
- * The DictionaryFactory visits an AST and build Symbols for all variables
- * 
- * @author pazel
- *
- */
-public class DictionaryFactory extends ASTVisitor 
-{
-    protected IASTTranslationUnit    ast_   = null;
-    protected Dictionary             fDict_ = null;
-    
-    /**
-     * buildDictionary - static method to build dictionary
-     * @param ast - IASTTranslationUnit
-     * @return Dictionary
-     */
-	public static Dictionary buildDictionary(IASTTranslationUnit ast)
-	{
-		DictionaryFactory df = new DictionaryFactory(ast);
-		df.buildDictionary();
-		return df.getDictionary();
-	}
-	
-	/**
-	 * DictionaryFactory - constructor
-	 * @param ast - IASTTranslationUnit
-	 */
-	protected DictionaryFactory(IASTTranslationUnit ast)
-	{
-		ast_ = ast;
-		
-		fDict_ = new Dictionary(ast_);
-	}
-	
-	/**
-	 * Dictionary - accessor to Dictionary
-	 * @return Dictionary
-	 */
-	public Dictionary getDictionary()
-	{
-		return fDict_;
-	}
-	
-	/**
-	 * buildDictionary - build the dictionary
-	 *
-	 */
-	protected void buildDictionary()
-	{
-		shouldVisitDeclarations = true;
-		ast_.accept(this);
-	}
-	
-	/**
-	 * visit - ASTVisitor method capture to feed information into dicationary
-	 * @param declaration - IASTDeclaration
-	 * @return int
-	 */
-    public int visit(IASTDeclaration declaration) 
-    {
-        // If this is a function definition, acct for the parameters
-        if (declaration instanceof IASTFunctionDefinition) {
-            IASTFunctionDeclarator ifd = ((IASTFunctionDefinition)declaration).getDeclarator();
-            if (ifd instanceof IASTStandardFunctionDeclarator) {
-                IASTStandardFunctionDeclarator ifdc = (IASTStandardFunctionDeclarator)ifd;
-                IASTParameterDeclaration [] params = ifdc.getParameters();
-                for(int i=0; i<params.length; i++) {
-                    IASTDeclarator id = params[i].getDeclarator();
-                    fDict_.insert(id, params[i]);
-                }
-            }
-            //CFG cfg = CFGFactory.buildCFG((IASTFunctionDefinition)declaration);
-        }
-        else if (declaration instanceof IASTSimpleDeclaration)
-    	{
-    		fDict_.insert((IASTSimpleDeclaration)declaration);
-    	}
-    	return PROCESS_CONTINUE;
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/dictionary/Symbol.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/dictionary/Symbol.java
deleted file mode 100644
index a306c38..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/dictionary/Symbol.java
+++ /dev/null

@@ -1,149 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006, 2007 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.analysis.dictionary;
-
-import org.eclipse.cdt.core.dom.ast.DOMException;
-import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTParameterDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.ast.IBinding;
-import org.eclipse.cdt.core.dom.ast.IScope;
-import org.eclipse.cdt.internal.core.dom.parser.ASTInternal;
-
-/**
- * Holds a symbol definition
- * 
- * @author pazel
- * 
- */
-
-public class Symbol {
-	/** what is being defined */
-	protected IASTDeclarator declarator_ = null;
-	/**
-	 * declaration can be either IASTDeclaration or IASTParameterDeclaration;
-	 * this is the broader containing statement
-	 */
-	protected IASTNode declaration_ = null;
-	private static final boolean traceOn = false;
-
-	/**
-	 * constructor
-	 * 
-	 * @param declarator -
-	 *            IASTDeclarator
-	 * @param declaration -
-	 *            IASTDeclartion (for this declarator - and possibly others
-	 */
-	public Symbol(IASTDeclarator declarator, IASTDeclaration declaration) {
-		declarator_ = declarator;
-		declaration_ = declaration;
-	}
-
-	/**
-	 * constructor
-	 * 
-	 * @param declarator -
-	 *            IASTDeclarator
-	 * @param declaration -
-	 *            IASTParameterDeclartion (for this declarator - and possibly
-	 *            others
-	 */
-	public Symbol(IASTDeclarator declarator,
-			IASTParameterDeclaration declaration) {
-		declarator_ = declarator;
-		declaration_ = declaration;
-	}
-
-	/**
-	 * getName - get the name of the declarator
-	 * 
-	 * @return IASTName
-	 */
-	public IASTName getName() {
-		return declarator_.getName();
-	}
-
-	/**
-	 * getDeclarator - accessor to declarator
-	 * 
-	 * @return - IASTDeclarator
-	 */
-	public IASTDeclarator getDeclarator() {
-		return declarator_;
-	}
-
-	/**
-	 * getDeclaration - get the related declaration
-	 * 
-	 * @return - IASTNode (can be IASTDeclaration or IASTParameterDeclaration)
-	 */
-	public IASTNode getDeclaration() {
-		return declaration_;
-	}
-
-	/**
-	 * getScope - get the scope for this declarator
-	 * 
-	 * @return IScope
-	 */
-	public IScope getScope() {
-		// find the unique scope for this name
-		IASTName name = declarator_.getName();
-		IBinding binding = name.resolveBinding();
-		//IBinding binding = name.getBinding();
-		if (binding == null)
-			return null;
-
-		IScope scope = null;
-		try {
-			scope = binding.getScope();
-		} catch (DOMException e) {
-			System.out.println("SymbolBucket.find: exception " + e);
-			return null;
-		}
-
-		return scope;
-	}
-
-    /**
-     * getDefiningFunction - get the function in which declartor is defined
-     * @return IASTNode - either IASTTranslationUnit or IASTFunctionDefinition
-     */
-    public IASTNode getDefiningFunction()
-    {
-        IScope scope = getScope();
-        
-        if (scope==null)  return null;
-        
-        IASTNode node = null;
-        try {
-            //node = scope.getPhysicalNode(); // cdt 3.1
-            node = ASTInternal.getPhysicalNodeOfScope(scope); // cdt40
-        }
-        catch(DOMException e) { 
-            System.out.println("Symbol.getDefiningFunction exception "+e);
-            return null;
-        }
-        
-        // keep moving up the tree until we find the node
-        while(true) {
-            if (node==null)  return null;
-            if (node instanceof IASTTranslationUnit) return node;      // global dict
-            if (node instanceof IASTFunctionDefinition)  return node;  // our function
-            node = node.getParent();
-        }
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/internal/core/OpenMpIDs.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/internal/core/OpenMpIDs.java
deleted file mode 100644
index 3010bf1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/internal/core/OpenMpIDs.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007 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.analysis.internal.core;
-
-/**
- * IDs e.g. for markers
- * 
- * @author tibbitts
- * 
- */
-public class OpenMpIDs {
-	/**
-	 * These are the marker type used for showing concurrency
-	 */
-
-	public static final String ConcurrencyType = "org.eclipse.ptp.pldt.openmp.analysis.concurrency";
-	/**
-	 * These are the marker type used for showing non-concurrency
-	 */
-	public static final String NonConcurrencyType = "org.eclipse.ptp.pldt.openmp.analysis.nonconcurrency";
-	
-	public static final String OPENMP_RECOGNIZE_APIS_BY_PREFIX_ALONE = "openmpRecognizeAPIsByPrefixAlone";
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPBasicBlock.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPBasicBlock.java
deleted file mode 100644
index 6cd4080..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPBasicBlock.java
+++ /dev/null

@@ -1,251 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTBreakStatement;
-import org.eclipse.cdt.core.dom.ast.IASTCaseStatement;
-import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement;
-import org.eclipse.cdt.core.dom.ast.IASTContinueStatement;
-import org.eclipse.cdt.core.dom.ast.IASTDoStatement;
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTForStatement;
-import org.eclipse.cdt.core.dom.ast.IASTIfStatement;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTReturnStatement;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.cdt.core.dom.ast.IASTSwitchStatement;
-import org.eclipse.cdt.core.dom.ast.IASTWhileStatement;
-
-
-
-/**
- * Holds a consolidated (coarse) basic block for concurrency analysis
- * @author pazel
- */
-public class OMPBasicBlock extends OMPCFGNode
-{
-    protected LinkedList     statements_ = new LinkedList();  // contained stmts 
-    
-    protected IASTName       label_      = null;   // non-null if labeled block
-    
-    protected IASTExpression branchingExpression_ = null;
-    protected int            branchingType_       = NoBranch;
-    
-    public static final int NoBranch      = -1;
-    public static final int IfBranch      = 0;
-    public static final int SwitchBranch  = 1;
-    public static final int WhileBranch   = 2;
-    public static final int DoBranch      = 3;
-    public static final int ForBranch     = 4;
-    
-    /**
-     * OMPBasicBlock - Basic block for OMP CFG
-     *
-     */
-    public OMPBasicBlock()
-    {
-        super();
-    }
-    
-    /**
-     * addStatement - add an element to this basic block
-     * @param element - IASTNode
-     */
-    public void addStatement(IASTStatement element)
-    {
-        statements_.add(element);
-    }
-    
-    public IASTName getLabel()
-    {
-        return label_;
-    }
-    
-    /**
-     * isCase - informs if first statement is a CASE 
-     * @return boolean
-     */
-    public boolean isCase()
-    {
-        if (statements_.isEmpty())  return false;
-        IASTStatement statement = ((IASTStatement)statements_.getFirst());
-        return (statement instanceof IASTCaseStatement);
-    }
-
-    
-    public void setBranchingExpression(IASTExpression branch, int type)
-    {
-        branchingExpression_ = branch;
-        branchingType_       = type;
-    }
-    
-    /**
-     * getStatements - get the current list of statement for the node
-     * @return IASTStatement []
-     */
-    public IASTStatement [] getStatements()
-    {
-        IASTStatement [] list = new IASTStatement[statements_.size()];
-        int count = 0;
-        for(Iterator i=statements_.iterator(); i.hasNext();)
-            list[count++] = (IASTStatement)i.next();
-        return list;
-    }
-    
-    public IASTExpression getBranchingExpression() { return branchingExpression_; }
-    public int            getBranchingType()       { return branchingType_;       }
-    
-    protected LinkedList fundStmtsExprs_ = null; 
-    
-    /**
-     * getFundamentals - break down all statements/exprs to basics for concurrency map
-     * @return
-     */
-    public LinkedList getFundamentals()
-    {
-        if (fundStmtsExprs_!=null) return fundStmtsExprs_;
-        fundStmtsExprs_ = new LinkedList();
-        
-        for(Iterator i=statements_.iterator(); i.hasNext();) {
-            IASTStatement stmt = (IASTStatement)i.next();
-            FundVisitor fv = new FundVisitor(fundStmtsExprs_);
-            stmt.accept(fv);
-        }
-        
-        return fundStmtsExprs_;
-    }
-    
-    //-------------------------------------------------------------------------
-    // FundVisitor
-    //-------------------------------------------------------------------------
-    protected class FundVisitor extends ASTVisitor
-    {
-        protected LinkedList list_ = null;
-        
-        public FundVisitor(LinkedList list)
-        {
-            list_ = list;
-            shouldVisitStatements = true;
-        }
- 
-        public int visit(IASTStatement statement) {
-            
-            if (statement instanceof IASTIfStatement) {
-                processIfStatement((IASTIfStatement)statement);
-                return PROCESS_SKIP;
-            }
-            else if (statement instanceof IASTSwitchStatement) {
-                processSwitchStatement((IASTSwitchStatement)statement);
-                return PROCESS_SKIP;
-            }
-            else if (statement instanceof IASTCaseStatement) {
-                processCaseStatement((IASTCaseStatement)statement);
-                return PROCESS_CONTINUE;
-            }
-            else if (statement instanceof IASTForStatement) {
-                processForStatement((IASTForStatement)statement);
-                return PROCESS_SKIP;
-            }
-            else if (statement instanceof IASTWhileStatement) {
-                processWhileStatement((IASTWhileStatement)statement);
-                return PROCESS_SKIP;
-            }
-            else if (statement instanceof IASTDoStatement) {
-                processDoStatement((IASTDoStatement)statement);
-                return PROCESS_SKIP;
-            }
-            else if (statement instanceof IASTCompoundStatement) {
-                return PROCESS_CONTINUE;
-            }
-            else if (statement instanceof IASTBreakStatement) {
-                list_.add(statement);
-                return PROCESS_CONTINUE;
-            }
-            else if (statement instanceof IASTContinueStatement) {
-                list_.add(statement);
-                return PROCESS_CONTINUE;
-            }
-            else if (statement instanceof IASTReturnStatement) {
-                list_.add(statement);
-                return PROCESS_CONTINUE;
-            }
-             
-            list_.add(statement);
-            return PROCESS_CONTINUE;
-        }
-        
-        
-        protected void processIfStatement(IASTIfStatement statement)
-        {
-            list_.add(statement.getConditionExpression());
-            if (statement.getThenClause()!=null) {
-                FundVisitor thenVisitor = new FundVisitor(list_);
-                statement.getThenClause().accept(thenVisitor);
-            }
-            if (statement.getElseClause()!=null) {
-                FundVisitor elseVisitor = new FundVisitor(list_);
-                statement.getElseClause().accept(elseVisitor);
-            }
-        }
-        
-        protected void processSwitchStatement(IASTSwitchStatement statement)
-        {
-            list_.add(statement.getControllerExpression());
-            FundVisitor  bodyVisitor = new FundVisitor(list_);
-            statement.getBody().accept(bodyVisitor);
-        }
-        
-        protected void processCaseStatement(IASTCaseStatement statement)
-        {
-            list_.add(statement.getExpression());
-        }
-        
-        protected void processForStatement(IASTForStatement statement)
-        {
-            list_.add(statement.getConditionExpression());
-            list_.add(statement.getIterationExpression());
-            if (statement.getInitializerStatement()!=null) {
-                FundVisitor  initVisitor = new FundVisitor(list_);
-                statement.getInitializerStatement().accept(initVisitor);
-            }
-            if (statement.getBody()!=null) {
-                FundVisitor  bodyVisitor = new FundVisitor(list_);
-                statement.getBody().accept(bodyVisitor);
-            }
-        }
-        
-        protected void processWhileStatement(IASTWhileStatement statement)
-        {
-            list_.add(statement.getCondition());
-            if (statement.getBody()!=null) {
-                FundVisitor bodyVisitor = new FundVisitor(list_);
-                statement.getBody().accept(bodyVisitor);
-            }
-        }
-        
-        protected void processDoStatement(IASTDoStatement statement)
-        {
-            list_.add(statement.getCondition());
-            if (statement.getBody()!=null) {
-                FundVisitor bodyVisitor = new FundVisitor(list_);
-                statement.getBody().accept(bodyVisitor);
-            }
-        }
-
-
-    }
-
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPCFG.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPCFG.java
deleted file mode 100644
index 21d8219..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPCFG.java
+++ /dev/null

@@ -1,195 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg;
-
-import java.io.PrintStream;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.LinkedList;
-import java.util.Stack;
-
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTOMPPragma;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory.OMPCFGResult;
-
-/**
- * Control Flow Graph related to OMP Analysis
- * @author pazel
- *
- */
-public class OMPCFG
-{
-	private static final boolean traceOn=false;
-    protected PASTOMPPragma          pragma_        = null;
-    protected IASTStatement          statement_     = null;
-    protected OMPCFGNode             rootNode_      = null;
-    protected OMPCFGNode             termNode_      = null;
-    
-    protected OMPCFGResult.Chain     rootChain_ = null;
-    protected LinkedList             unconnectedChains_ = null;
-    protected LinkedList             unresolvedChains_  = null;
-    protected Hashtable              labelMap_          = null;
-    
-    public OMPCFG(PASTOMPPragma      pragma, 
-                  IASTStatement      statement, 
-                  OMPCFGResult.Chain rootChain,
-                  LinkedList         unconnectedChains, 
-                  LinkedList         unresolvedChains, 
-                  Hashtable          labelMap)
-    {
-        pragma_        = pragma;
-        statement_     = statement;
-        rootNode_      = rootChain.getHeadNode();
-        termNode_      = rootChain.getTailNode();
-        
-        rootChain_         = rootChain;
-        unconnectedChains_ = unconnectedChains;
-        unresolvedChains_  = unresolvedChains;
-        labelMap_          = labelMap;
-        
-        numberNodes();
-    }
-    
-    /**
-     * getStatement - accessor to statement for this cfg
-     * @return IASTStatement
-     */
-    public IASTStatement getStatement()
-    {
-        return statement_;
-    }
-    
-    /**
-     * getPragma - get the pragme for the cfg
-     * @return PASTOMPPragma
-     */
-    public PASTOMPPragma getPragma()
-    {
-        return pragma_;
-    }
-    
-    /**
-     * getRoot - access the root of the cfg
-     * @return - OMPCFGNode
-     */
-    public OMPCFGNode getRoot()
-    {
-        return rootNode_;
-    }
-    
-    /**
-     * getTermNode - get the terminal node (assuming one)
-     * @return OMPCFGNode
-     */
-    public OMPCFGNode getTermNode()
-    {
-        return termNode_;
-    }
-    
-    // The following for printing out the graph
-    
-    protected Stack       graphStack_    = new Stack();
-    protected HashSet     usedNodes_     = new HashSet();
-    protected PrintStream graphOut_      = null;
-    protected int         currentNumber_ = 0;
-    
-    public void printCFG(PrintStream printOut)
-    {
-        graphOut_ = printOut;
-
-        usedNodes_.clear();
-        
-        numberNodes();
-        
-        visitGraph();
-    }
-    
-    private void numberNodes()
-    {
-        currentNumber_ = 0;
-        graphStack_.clear();
-        graphStack_.push(rootNode_);
-        while(!graphStack_.isEmpty()) {
-            OMPCFGNode node = (OMPCFGNode)graphStack_.pop();
-            node.setId(currentNumber_++);
-            // Add in other nodes
-            OMPCFGNode [] nodes = node.getOutNodes();
-            for(int i=0; i<nodes.length; i++) {
-                if (nodes[i].getId()==-1)  // only if not assigned number
-                    graphStack_.push(nodes[i]);
-            }
-        }
-    }
-    
-    private void visitGraph()
-    {
-        graphStack_.clear();
-        graphStack_.push(rootNode_);
-        while(!graphStack_.isEmpty()) {
-            OMPCFGNode node = (OMPCFGNode)graphStack_.pop();
-            printNode(node);
-            usedNodes_.add(node);
-            // Add in other nodes
-            OMPCFGNode [] nodes = node.getOutNodes();
-            for(int i=0; i<nodes.length; i++) {
-                if (!(nodes[i] instanceof OMPCFGNode)) {
-                    if(traceOn)System.out.println("Node " + nodes[i].getId() + 
-                            " has out node of type: "+nodes[i].getClass());
-                    continue;
-                }
-                if (!usedNodes_.contains(nodes[i]))  // only if not processed
-                    graphStack_.push(nodes[i]);
-            }
-            
-        }
-    }
-    
-    private void printNode(OMPCFGNode node)
-    {
-        int num = node.getId();
-        if(traceOn)graphOut_.println("Node "+num+" ------------------ "+getShortClassName(node.getClass()));
-        
-        // some contents of the node
-        if (node instanceof OMPBasicBlock) {
-            OMPBasicBlock obb = (OMPBasicBlock)node;
-            IASTStatement [] stmts = obb.getStatements();
-            for(int i=0; i<stmts.length; i++)
-                if(traceOn)System.out.println("       -------- "+getShortClassName(stmts[i].getClass()));
-        }
-        
-        
-        
-        OMPCFGNode [] nodes = node.getOutNodes();
-        if(traceOn)graphOut_.print("      out to the following "+nodes.length+" nodes:");
-        for(int i=0; i<nodes.length; i++) {
-            int index = nodes[i].getId();
-            if(traceOn)graphOut_.print(" "+index);
-        }
-        if(traceOn)System.out.println();
-        OMPCFGNode [] inodes = node.getInNodes();
-        if(traceOn)graphOut_.print("      in from the following "+inodes.length+" nodes:");
-        for(int i=0; i<inodes.length; i++) {
-            int index = inodes[i].getId();
-            if(traceOn)graphOut_.print(" "+index);
-        }
-        if(traceOn)System.out.println();
-
-    }
-    
-    private String getShortClassName(Class c)
-    {
-        String n = c.toString();
-        int lastIndex = n.lastIndexOf('.');
-        return n.substring(lastIndex+1);
-    }
-
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPCFGNode.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPCFGNode.java
deleted file mode 100644
index e7b5b11..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPCFGNode.java
+++ /dev/null

@@ -1,131 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-
-/**
- * Base class of OMP CFG
- * @author pazel
- *
- */
-public class OMPCFGNode
-{
-    // Use these while being built
-    protected LinkedList inNodes_  = new LinkedList();
-    protected LinkedList outNodes_ = new LinkedList();
-    
-    protected int        id_       = -1;   // useful for correlating phase displays
-    
-    protected OMPPragmaNode  pragmaContext_ = null;   // pragma chain head for this node
-
-    /**
-     * OMPCFGNode - constructor
-     *
-     */
-    public OMPCFGNode()
-    {
-        
-    }
-     
-    /**
-     * connectTo - make "this" point forward to input node (forward control flow)
-     * @param node - OMPCFGNode (that succeeds this in control flow
-     */
-    public void connectTo(OMPCFGNode node)
-    {
-        if (node==null) return;
-        addOutNode(node);
-        node.addInNode(this);
-    }
-    
-    /**
-     * addInNode - add an input node
-     * @param inNode - OMPCFGNode
-     */
-    public void addInNode(OMPCFGNode inNode)
-    {
-        if (!inNodes_.contains(inNode))
-            inNodes_.add(inNode);
-    }
-    
-    /**
-     * addOutNode - add an output node
-     * @param outNode - OMPCFGNode
-     */
-    public void addOutNode(OMPCFGNode outNode)
-    {
-        if (!outNodes_.contains(outNode))
-            outNodes_.add(outNode);
-    }
-    
-    /**
-     * getSuccessor - useful function to be used when it is known that there is 1 successor
-     *                no check made for more than 1 - used in following chains
-     * @return OMPCFGNode
-     */
-    public OMPCFGNode getSuccessor()
-    {
-        if (outNodes_.size()!=0)
-            return (OMPCFGNode)(outNodes_.get(0));
-        return null;
-    }
-    
-    /**
-     * hasPredecessors - tell if node has predecessors
-     * @return boolean
-     */
-    public boolean hasPredecessors()
-    {
-        return (inNodes_.size()!=0);
-    }
-    
-    /**
-     * getInNodes - accessor to input nodes
-     * @return OMPCFGNode []
-     */
-    public OMPCFGNode [] getInNodes()
-    {
-       OMPCFGNode [] inNodesArray = new OMPCFGNode[inNodes_.size()];
-       int count=0;
-       for(Iterator i=inNodes_.iterator(); i.hasNext();)
-       { inNodesArray[count++] = (OMPCFGNode)i.next();  }
-       return inNodesArray;
-    }
-    
-    /**
-     * getOutNodes - accessor to output nodes
-     * @return OMPCFGNode []
-     */
-    public OMPCFGNode [] getOutNodes()
-    {
-        OMPCFGNode [] outNodesArray = new OMPCFGNode[outNodes_.size()];
-        int count=0;
-        for(Iterator i=outNodes_.iterator(); i.hasNext();)
-        { outNodesArray[count++] = (OMPCFGNode)i.next();  }
-        return outNodesArray;
-    }
-
-
-    public void setId(int id)
-    {
-        id_ = id;
-    }
-    
-    public int getId() { return id_; }
-    
-    public void setPragmaContext(OMPPragmaNode pNode) { pragmaContext_ = pNode; }
-    
-    public OMPPragmaNode getPragmaContext() { return pragmaContext_; }
-
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPDFS.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPDFS.java
deleted file mode 100644
index d5b991f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPDFS.java
+++ /dev/null

@@ -1,118 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Stack;
-
-/**
- * Does a depth first search through an OMPCFG,
- * given the initial node
- * @author pazel
- *
- */
-public abstract class OMPDFS
-{
-    protected OMPCFGNode    startNode_    = null;
-    protected HashSet       visited_      = new HashSet();
-    
-    protected Stack         currentNodes_ = new Stack();
-    
-    public static final int CONTINUE   = 0;
-    public static final int SKIP       = 1;  // SKIP following current node further
-    public static final int ABORT      = 2;  // abord DFS
-    
-    /**
-     * OMPDFS - constructor
-     * @param startNode - OMPCFGNode
-     */
-    public OMPDFS(OMPCFGNode startNode)
-    {
-        startNode_ = startNode;
-    }
-    
-    /**
-     * startWalking - method to start the dfs walking
-     *
-     */
-    public void startWalking()
-    {
-        walkDFS(startNode_);
-    }
-    
-    /**
-     * walkDFS - recursively walk the tree visiting each node 1 time
-     *           NOTE: only connected component to start node
-     * @param node - OMPCFGNode
-     * @return int    (code to continue, skip, or abort)
-     */
-    protected int walkDFS(OMPCFGNode node)
-    {
-        if (visited_.contains(node))  return CONTINUE;
-        
-        currentNodes_.push(node);  // sets the new context on the stack
-        int code = visit(node);
-        visited_.add(node);
-        
-        if (code==SKIP)  { currentNodes_.pop();  return CONTINUE; }  // we only skip this level, continue others
-        if (code==ABORT) { currentNodes_.pop();  return ABORT;    }
-        
-        OMPCFGNode [] outNodes = node.getOutNodes();
-        for(int i=0; i<outNodes.length; i++) {
-           int iCode = walkDFS(outNodes[i]);
-           if (iCode==ABORT) { currentNodes_.pop();  return ABORT;  } // code cannot be skip
-        }
-        currentNodes_.pop();
-        
-        return CONTINUE;
-    }
-    
-    /**
-     * getNodeStack - get the current node stack context
-     * @return OMPCFGNode []
-     */
-    public OMPCFGNode [] getNodeStack()
-    {
-        OMPCFGNode [] l = new OMPCFGNode[currentNodes_.size()];
-        int count=0;
-        for(Iterator i=currentNodes_.iterator(); i.hasNext();) 
-            l[count++] = (OMPCFGNode)i.next();
-        return l;
-    }
-    
-    /**
-     * getNodeStackSize - get the size of the stack
-     * @return int
-     */
-    public int getNodeStackSize()
-    {
-        return currentNodes_.size();
-    }
-    
-    /**
-     * isVisited - determine if node has been visited on walk
-     * @param node - OMPCFGNode
-     * @return boolean
-     */
-    public boolean isVisited(OMPCFGNode node)
-    {
-        return visited_.contains(node);
-    }
-    
-    /**
-     * visit - visit method - what the user usually overrides
-     * @param node - OMPCFGNode
-     */
-    public abstract int visit(OMPCFGNode node);
-
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPExpressionBlock.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPExpressionBlock.java
deleted file mode 100644
index 7e3788f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPExpressionBlock.java
+++ /dev/null

@@ -1,70 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTExpressionList;
-/**
- * Holds a consolidated (coarse) basic block for concurrency analysis
- * @author pazel
- *
- */
-public class OMPExpressionBlock extends OMPCFGNode
-{
-    /** Use this while building */
-    protected LinkedList expressions_ = new LinkedList(); // of IASTExpressions (for now)
-
-    public OMPExpressionBlock()
-    {
-        super();
-    }
-    
-    /**
-     * addExpression - add a statement to the basic block
-     * @param expression - IASTExpression
-     */
-    public void addExpression(IASTExpression expression)
-    {
-        expressions_.add(expression);
-    }
-    
-    /**
-     * addExpression - but for an expression list
-     * @param expression - IASTExpressionList
-     */
-    public void addExpression(IASTExpressionList expression)
-    {
-        IASTExpression [] list = expression.getExpressions();
-        for(int i=0; i<list.length; i++) {
-            if (list[i] instanceof IASTExpressionList)
-                addExpression((IASTExpressionList)list[i]);
-            else
-                addExpression(list[i]);
-        }
-    }
-    
-    /**
-     * getExpressions - accessor to array of statements
-     * @return IASTExpression []
-     */
-    public IASTExpression [] getExpressions()
-    {
-       IASTExpression [] list = new IASTExpression[expressions_.size()];
-       int count = 0;
-       for(Iterator i=expressions_.iterator(); i.hasNext();)
-           list[count++] = (IASTExpression)i.next();
-       return list;
-    }
-    
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPPragmaNode.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPPragmaNode.java
deleted file mode 100644
index 19efafe..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/OMPPragmaNode.java
+++ /dev/null

@@ -1,116 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg;
-
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTOMPPragma;
-
-
-/**
- * 
- * @author pazel
- *
- */
-public class OMPPragmaNode extends OMPCFGNode
-{
-    protected PASTOMPPragma     pragma_          = null;   // pragma we are holding
-    protected OMPPragmaNode     contextPred_     = null;   // backward chain of context
-    
-    protected boolean           implicitBarrier_ = false;   // used to tie parallel/for/sections end
-    
-    /**
-     * OMPPragmaNode - Constructor
-     * @param pragma - PASTOMPPragma
-     * @param contextPredecessor - OMPPragmaNode
-     */
-    public OMPPragmaNode(PASTOMPPragma pragma, OMPPragmaNode contextPredecessor)
-    {
-        super();
-        pragma_       = pragma;
-        contextPred_ = contextPredecessor;
-    }
-    
-    /**
-     * OMPPragmaNode - constructor
-     * @param pragma - PASTOMPPragma
-     */
-    public OMPPragmaNode(PASTOMPPragma pragma)
-    {
-        super();
-        pragma_     = pragma;
-    }
-    
-    public OMPPragmaNode()
-    {
-        super();
-        implicitBarrier_ = true;
-    }
-    
-    /**
-     * getPragma - accessor to pragma
-     * @return PASTOMPPragma
-     */
-    public PASTOMPPragma getPragma()
-    {
-        return pragma_;
-    }
-    
-    /**
-     * isImplicitBarrier - returns whether if is implicit barrier
-     * @return boolean
-     */
-    public boolean isImplicitBarrier()
-    {
-        return implicitBarrier_;
-    }
-    
-    /**
-     * getContextPredecessor - get the pragma context predecessor
-     * @return
-     */
-    public OMPPragmaNode getContextPredecessor()
-    {
-        return contextPred_;
-    }
-    
-    /**
-     * getContext - get the list of related pragma - most recent to oldest [0--N]
-     * @return OMPPragmaNode []
-     */
-    public OMPPragmaNode [] getContext()
-    {
-        int count = 0;
-        OMPPragmaNode pred = this;
-        while(pred!=null) {
-            count++;
-            pred=pred.getContextPredecessor();  
-        }
-        
-        OMPPragmaNode [] list = new OMPPragmaNode[count];
-        int i = 0;
-        pred = this;
-        while(pred!=null) {
-            list[i++] = pred;
-            pred=pred.getContextPredecessor();
-        }
-        
-        return list;
-    }
-    
-    public String getType()
-    {
-        if (pragma_!=null)  return pragma_.getType();
-        else {
-            if (implicitBarrier_)  return "implicit barrier";
-        }
-        return "";
-    }
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/FileConcurrencyAnalysis.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/FileConcurrencyAnalysis.java
deleted file mode 100644
index a041ac5..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/FileConcurrencyAnalysis.java
+++ /dev/null

@@ -1,151 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory;
-
-import java.net.URI;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Set;
-
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTOMPPragma;
-
-
-/**
- * Build an analysis for a given file
- * @author pazel
- *
- */
-public class FileConcurrencyAnalysis
-{
-    protected IASTTranslationUnit         astTransUnit_ = null;
-    protected IFile                       iFile_        = null;
-    protected PASTOMPPragma     []        pragmas_      = null;
-    protected FunctionConcurrencyAnalysis   [] analyses_     = null;
-    
-    protected static final boolean traceOn = false;
-    
-    /**
-     * FileConcurrencyAnalysis - Holds analysis for an entire file
-     * @param astTransUnit
-     * @param iFile
-     * @param ompPragmas
-     */
-    public FileConcurrencyAnalysis(IASTTranslationUnit astTransUnit, 
-                                   IFile               iFile,
-                                   PASTOMPPragma []    ompPragmas)
-    {
-        astTransUnit_   = astTransUnit;
-        iFile_          = iFile;
-        pragmas_        = ompPragmas;
-        buildFileAnalysis();
-    }
-    
-    /**
-     * getNodesConcurrentTo - get all nodes concurrent to given node
-     * @param node - IASTNode
-     * @return Set
-     */
-    public Set getNodesConcurrentTo(IASTNode node)
-    {
-        // designed so we use the 1st non-null. 
-        for(int i=0; i<analyses_.length; i++) {
-            Set s = analyses_[i].getNodesConcurrentTo(node);
-            if (s!=null)  return s;
-        }
-        return new HashSet();
-    }
-
-    
-    /**
-     * buildFileAnalysis - concurrency analysis
-     *
-     */
-    protected void buildFileAnalysis()
-    {
-        DefVisitor dv = new DefVisitor(astTransUnit_, iFile_, pragmas_);
-        analyses_ = dv.buildAnalyses();
-        
-        // build the phase analysis
-        for(int i=0; i<analyses_.length; i++) {
-            FunctionConcurrencyAnalysis oca = analyses_[i];
-            oca.doPhaseAnalysis();
-            if (traceOn) oca.printAnalysis(System.out);
-        }
-    }
-
-    //-------------------------------------------------------------------------
-    // Class: DefVisitor - used to locate functions within file, for 
-    //        concurrency analysis
-    //-------------------------------------------------------------------------
-    private static class DefVisitor extends ASTVisitor
-    {
-        private IASTTranslationUnit     transUnit_    = null;
-        private IFile                   iFile_        = null;
-        private PASTOMPPragma       []  pList_        = null;
-        private LinkedList              analysisList_ = new LinkedList();
-        
-        public DefVisitor(IASTTranslationUnit transUnit, IFile iFile, PASTOMPPragma [] pList)
-        { transUnit_ = transUnit; pList_ = pList; iFile_=iFile; }
-        
-        /**
-         * buildAnalyses - build one analysis object per function found in file
-         * @return
-         */
-        public FunctionConcurrencyAnalysis [] buildAnalyses()
-        {
-            shouldVisitDeclarations = true;
-            transUnit_.accept(this);
-            
-            FunctionConcurrencyAnalysis [] list = new FunctionConcurrencyAnalysis[analysisList_.size()];
-            int count = 0;
-            for(Iterator i=analysisList_.iterator(); i.hasNext();)
-                list[count++] = (FunctionConcurrencyAnalysis)i.next();
-            return list;
-        }
-        
-        /**
-         * visit - ASTVisitor method capture to feed information into analysis
-         * @param declaration - IASTDeclaration
-         * @return int
-         */
-        public int visit(IASTDeclaration declaration) 
-        {
-            if (declaration instanceof IASTFunctionDefinition) {
-                IASTFunctionDefinition fDef = (IASTFunctionDefinition)declaration;
-                
-                // If the file the functionDef is in is the same as THIS file, add it to our list.
-                // Note: 1 Sept 2010: this doesn't match even for local files now, so ... nothing is added??
-                URI uri=iFile_.getLocationURI();
-                String str2=uri.getPath();
-                            
-                // str1 will be abs path to the file on whatever file system it's on (can't tell local vs. remote)
-                String str1 = fDef.getContainingFilename();
-                // Note: this is a best-guess if they match. Files on different systems with exactly the same path string will "match" when 
-                // in reality they probably shouldn't.              
-                if (str1.equals(str2)) {
-                    FunctionConcurrencyAnalysis analysis = new FunctionConcurrencyAnalysis(fDef, pList_);
-                    analysisList_.add(analysis);
-                }
-            }
-            return PROCESS_CONTINUE;
-        }
-
-    }
-
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/FileStatementMap.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/FileStatementMap.java
deleted file mode 100644
index 10caca4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/FileStatementMap.java
+++ /dev/null

@@ -1,211 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory;
-
-import java.io.PrintStream;
-
-import org.eclipse.cdt.core.dom.CDOM;
-import org.eclipse.cdt.core.dom.IASTServiceProvider.UnsupportedDialectException;
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTBreakStatement;
-import org.eclipse.cdt.core.dom.ast.IASTCaseStatement;
-import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement;
-import org.eclipse.cdt.core.dom.ast.IASTContinueStatement;
-import org.eclipse.cdt.core.dom.ast.IASTDoStatement;
-import org.eclipse.cdt.core.dom.ast.IASTForStatement;
-import org.eclipse.cdt.core.dom.ast.IASTIfStatement;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTReturnStatement;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.cdt.core.dom.ast.IASTSwitchStatement;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.ast.IASTWhileStatement;
-import org.eclipse.core.resources.IFile;
-
-/**
- * Builds and interfaces map from file location to statement
- * @author pazel
- *
- */
-public class FileStatementMap extends StatementMap
-{
-    protected IASTTranslationUnit tu_       = null;
-    protected String              filename_ = "";
-
-    /**
-     * FileStatementMap - constructor
-     * @param file   - IFile
-     * @throws UnsupportedDialectException
-     */
-    public FileStatementMap(IFile file) throws UnsupportedDialectException
-    {
-        tu_ = CDOM.getInstance().getTranslationUnit(file);
-        filename_=tu_.getFilePath();
-    }
-    
-    /**
-     * FileStatementMap - constructor
-     * @param tu - IASTTranslationUnit
-     */
-    public FileStatementMap(IASTTranslationUnit tu)
-    {
-        tu_ = tu;
-        filename_=tu_.getFilePath();
-    }
-    
-    /**
-     * buildMap - build the actual map
-     *
-     */
-    public void buildMap()
-    {
-        Visitor v = new Visitor();
-        tu_.accept(v);
-    }
-    
-    
-    private String getShortClassName(Class c)
-    {
-        String n = c.toString();
-        int lastIndex = n.lastIndexOf('.');
-        return n.substring(lastIndex+1);
-    }
-
-    
-    //-------------------------------------------------------------------------
-    // Visitor - to visit all statements and some expressions
-    //-------------------------------------------------------------------------
-    protected class Visitor extends ASTVisitor
-    {
-        
-        public Visitor()
-        {
-            shouldVisitStatements  = true;
-        }
-
-        public int visit(IASTStatement statement) 
-        {
-            
-            if (filename_==null || !(filename_.equals(statement.getContainingFilename())))
-                return PROCESS_CONTINUE;
-            
-            if (statement instanceof IASTIfStatement) {
-                processIfStatement((IASTIfStatement)statement);
-                return PROCESS_SKIP;
-            }
-            else if (statement instanceof IASTSwitchStatement) {
-                processSwitchStatement((IASTSwitchStatement)statement);
-                return PROCESS_SKIP;
-            }
-            else if (statement instanceof IASTCaseStatement) {
-                processCaseStatement((IASTCaseStatement)statement);
-                return PROCESS_CONTINUE;
-            }
-            else if (statement instanceof IASTForStatement) {
-                processForStatement((IASTForStatement)statement);
-                return PROCESS_SKIP;
-            }
-            else if (statement instanceof IASTWhileStatement) {
-                processWhileStatement((IASTWhileStatement)statement);
-                return PROCESS_SKIP;
-            }
-            else if (statement instanceof IASTDoStatement) {
-                processDoStatement((IASTDoStatement)statement);
-                return PROCESS_SKIP;
-            }
-            else if (statement instanceof IASTCompoundStatement) {
-                return PROCESS_CONTINUE;
-            }
-            else if (statement instanceof IASTBreakStatement) {
-                add(statement);
-                return PROCESS_CONTINUE;
-            }
-            else if (statement instanceof IASTContinueStatement) {
-                add(statement);
-                return PROCESS_CONTINUE;
-            }
-            else if (statement instanceof IASTReturnStatement) {
-                add(statement);
-                return PROCESS_CONTINUE;
-            }
-            
-            add(statement);
-            return PROCESS_CONTINUE;
-        }
-        
-        protected void processIfStatement(IASTIfStatement statement)
-        {
-            add(statement.getConditionExpression());
-            if (statement.getThenClause()!=null) {
-              Visitor thenVisitor = new Visitor();
-              statement.getThenClause().accept(thenVisitor);
-            }
-            if (statement.getElseClause()!=null) {
-              Visitor elseVisitor = new Visitor();
-              statement.getElseClause().accept(elseVisitor);
-            }
-        }
-        
-        protected void processSwitchStatement(IASTSwitchStatement statement)
-        {
-            add(statement.getControllerExpression());
-            Visitor  bodyVisitor = new Visitor();
-            statement.getBody().accept(bodyVisitor);
-        }
-        
-        protected void processCaseStatement(IASTCaseStatement statement)
-        {
-            add(statement.getExpression());
-        }
-        
-        protected void processForStatement(IASTForStatement statement)
-        {
-            add(statement.getConditionExpression());
-            add(statement.getIterationExpression());
-            if (statement.getInitializerStatement()!=null) {
-              Visitor initVisitor = new Visitor();
-              statement.getInitializerStatement().accept(initVisitor);
-            }
-            if (statement.getBody()!=null) {
-                Visitor bodyVisitor = new Visitor();
-                statement.getBody().accept(bodyVisitor);
-            }
-        }
-        
-        protected void processWhileStatement(IASTWhileStatement statement)
-        {
-            add(statement.getCondition());
-            if (statement.getBody()!=null) {
-                Visitor bodyVisitor = new Visitor();
-                statement.getBody().accept(bodyVisitor);
-            }
-        }
-        
-        protected void processDoStatement(IASTDoStatement statement)
-        {
-            add(statement.getCondition());
-            if (statement.getBody()!=null) {
-                Visitor bodyVisitor = new Visitor();
-                statement.getBody().accept(bodyVisitor);
-            }
-        }
-        
-        protected void printInformation(IASTNode node, PrintStream out)
-        {
-            Location l=getLocation(node);
-            System.out.println("Statement: "+getShortClassName(node.getClass())+
-                    " loc=("+l.low_+","+l.high_+")   file="+node.getContainingFilename());
-             
-        }
-
-    }
-    
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/FunctionConcurrencyAnalysis.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/FunctionConcurrencyAnalysis.java
deleted file mode 100644
index 8e55106..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/FunctionConcurrencyAnalysis.java
+++ /dev/null

@@ -1,212 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory;
-
-import java.io.PrintStream;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Set;
-
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTOMPPragma;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTPragma;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPCFG;
-
-
-/**
- * Concurrency Analysis for a given function
- * 
- * @author pazel
- */
-public class FunctionConcurrencyAnalysis extends ASTVisitor
-{
-    protected IASTFunctionDefinition fDef_              = null;
-    protected Hashtable              pragmaRegionMap_   = null;  // maps region to omp pragma
-    protected Hashtable              pragmaLocationMap_ = null;  // maps stmt to set of pragmas
-    protected LinkedList             components_        = new LinkedList();   // of RegionConcurrencyAnalysis's
-
-    public FunctionConcurrencyAnalysis(IASTFunctionDefinition fDef, PASTOMPPragma [] pList)
-    {
-        fDef_    = fDef;
-        pragmaRegionMap_   = buildRegionMap(pList);
-        pragmaLocationMap_ = buildLocationMap(pList);
-        
-        shouldVisitStatements   = true;
-        fDef_.accept(this);
-    }
-     
-    /**
-     * addComponent - add a component to this analysis
-     * @param component - RegionConcurrencyAnalysis
-     */
-    private void addComponent(RegionConcurrencyAnalysis component)
-    {
-        if (!components_.contains(component)) {
-            components_.add(component);
-            component.setParent(this);
-        }
-    }
-    
-    /**
-     * getComponents - get the list of existing components
-     * @return RegionConcurrencyAnalysis
-     */
-    public RegionConcurrencyAnalysis [] getComponents()
-    {
-        RegionConcurrencyAnalysis [] list = new RegionConcurrencyAnalysis[components_.size()];
-        for(int i=0; i<list.length; i++)
-            list[i] = (RegionConcurrencyAnalysis)components_.get(i);
-        return list;
-    }
-    
-    /**
-     * doPhaseAnalysis - for each component
-     *
-     */
-    public void doPhaseAnalysis()
-    {
-        for(Iterator i=components_.iterator(); i.hasNext();) {
-           RegionConcurrencyAnalysis occ = (RegionConcurrencyAnalysis)i.next();
-           occ.doPhaseAnalysis();
-        }
-    }
-    
-    
-    /**
-     * getNodesConcurrentTo - get all nodes concurrent to given node
-     * @param node - IASTNode
-     * @return Set
-     */
-    public Set getNodesConcurrentTo(IASTNode node)
-    {
-        // designed so we use the 1st non-null.  Components are assumed disjoint now.
-        for(Iterator i=components_.iterator(); i.hasNext();) {
-            RegionConcurrencyAnalysis component = (RegionConcurrencyAnalysis)i.next();
-            Set s = component.getNodesConcurrentTo(node);
-            if (s!=null)  return s;
-        }
-        return null;
-    }
-
-    
-    public void printAnalysis(PrintStream ps)
-    {
-        int count=0;
-        for(Iterator i=components_.iterator(); i.hasNext();) {
-            RegionConcurrencyAnalysis occ = (RegionConcurrencyAnalysis)i.next();
-            ps.println("Component "+count+" ----------------------------------");
-            occ.printComponent(ps);
-            count++;
-         }
-    }
-    
-    
-    /**
-     * buildRegionMap - build the region-->pragma map for this function
-     * @param pList - PASTPragma [] pList [obtainable from OpenMPAnalysisManager]
-     * @return Hashtable (mapping IASTNode-->PASTOMPPragma for this function)
-     */
-    protected Hashtable buildRegionMap(PASTPragma [] pList) 
-    {
-        Hashtable map = new Hashtable();
-        
-        for(int i=0; i<pList.length; i++) {
-            if (pList[i] instanceof PASTOMPPragma) {
-                PASTOMPPragma pragma = (PASTOMPPragma)pList[i];
-                IASTNode      region = pragma.getRegion();
-                if (region!=null && pragma.isCompiled() && isRegionDefinedInFctn(region))
-                    map.put(region, pragma);  // add to the map
-            }
-        }
-        
-        return map;
-    }
-    
-    /**
-     * buildLocationMap - build a map from location to set of pragmas "following" it
-     * @param pList
-     * @return
-     */
-    protected Hashtable buildLocationMap(PASTPragma [] pList)
-    {
-        Hashtable map = new Hashtable();
-        
-        for(int i=0; i<pList.length; i++) {
-            if (pList[i] instanceof PASTOMPPragma) {
-                PASTOMPPragma pragma = (PASTOMPPragma)pList[i];
-                IASTNode      location = pragma.getLocation();
-                if (location!=null && pragma.isCompiled() && isRegionDefinedInFctn(location)) {
-                    LinkedList l = (LinkedList)map.get(location);
-                    if (l==null) {
-                        l = new LinkedList();
-                        map.put(location, l);
-                    }
-                    l.add(pragma);
-                }
-            }
-        }
-        
-        return map;
-        
-    }
-    
-    /**
-     * isRegionDefinedInFctn - determines in node in scope of function
-     * @param node - IASTNode
-     * @return boolean
-     */
-    public boolean isRegionDefinedInFctn(IASTNode node)
-    {
-        while(node!=null) {
-            if (node==fDef_)  return true;
-            node = node.getParent();
-        }
-        return false;
-    }
-    
-
-    /**
-     * visit - visit statements
-     *         NOTE: we keep looking for stmts associated with pragmas - to build a new RegionConcurrencyAnalysis
-     * @param statement - IASTStatement
-     */
-    public int visit(IASTStatement statement) 
-    {
-        PASTOMPPragma pragma = (PASTOMPPragma)pragmaRegionMap_.get(statement);
-        if (pragma!=null) {
-            buildRegionAnalysis(pragma, statement);
-            return PROCESS_SKIP;   // Skip the part that will be handled in more detail
-        }
-        return PROCESS_CONTINUE;
-    }
-    
-    /**
-     * buildRegionAnalysis - build an analysis of this "pragma" region of the program
-     * @param pragma    - PASTOMPPragma
-     * @param statement - IASTStatement;
-     */
-    protected void buildRegionAnalysis(PASTOMPPragma pragma, IASTStatement statement)
-    {
-        // build the cfg
-        OMPCFG cfg = OMPCFGMaker.constructCFG(pragma, statement, pragmaRegionMap_, pragmaLocationMap_);
-       
-        cfg.printCFG(System.out);
-
-        addComponent(new RegionConcurrencyAnalysis(cfg));
-    }
-
-
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/OMPCFGMaker.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/OMPCFGMaker.java
deleted file mode 100644
index 1625554..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/OMPCFGMaker.java
+++ /dev/null

@@ -1,685 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Stack;
-
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTBreakStatement;
-import org.eclipse.cdt.core.dom.ast.IASTCaseStatement;
-import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement;
-import org.eclipse.cdt.core.dom.ast.IASTContinueStatement;
-import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTDoStatement;
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTForStatement;
-import org.eclipse.cdt.core.dom.ast.IASTIfStatement;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTReturnStatement;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.cdt.core.dom.ast.IASTSwitchStatement;
-import org.eclipse.cdt.core.dom.ast.IASTWhileStatement;
-
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTOMPPragma;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPBasicBlock;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPCFG;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPCFGNode;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPExpressionBlock;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPPragmaNode;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory.OMPCFGResult.Chain;
-
-
-/**
- * Builds a section of the control flow graph (like CFGMaker)
- * @author pazel
- *
- */
-public class OMPCFGMaker extends ASTVisitor
-{
-    protected IASTNode      tNode_       = null;
-    
-    // This is the return structure
-    protected OMPCFGResult  result_      = new OMPCFGResult();
-
-    
-    // These get passed down to each level - 
-    //     pragmaRegionMap_ never changes
-    //     pragmaContext increases/decreases on encountering pragma statements 
-    protected static Hashtable  pragmaRegionMap_   = null;  // maps IASTNode to pragma, if node is a pragma region
-    protected static Hashtable  pragmaLocationMap_ = null;  // maps IASTnode to list of pragmas that may immed. succeed it
-    protected static Stack      pragmaContext_     = null;  // stack of pragma - indicating depth of OMP control
-    
-    // Again the perspective is that we are building a list of a mix of 
-    //     basic blocks and pragma nodes - nested processing done recursively
-    // This two items manage the progress on the current chain
-    protected OMPCFGNode    firstNode_   = null;
-    protected OMPCFGNode    currentNode_ = null;
-    
-    protected static boolean  traceOn_     = false;
-    
-    /**
-     * constructCFG - static method to build the cfg
-     * @param pragma                - PASTOMPPragma (focus pragma for this graph
-     * @param statement             - IASTStatement (region for pragma)
-     * @param pragmaRegionMap       - Hashtable (mapping region to pragma)
-     * @param pragmaLocationMap     - Hashtable (mapping IASTNode to list of immed. succ. pragmas)
-     * @return OMPCFG
-     */
-    public static OMPCFG constructCFG(PASTOMPPragma pragma, IASTStatement statement, Hashtable pragmaRegionMap, Hashtable pragmaLocationMap)
-    {
-        pragmaRegionMap_   = pragmaRegionMap;
-        pragmaLocationMap_ = pragmaLocationMap;
-        pragmaContext_     = new Stack();
-        
-        OMPCFGMaker maker = new OMPCFGMaker(statement);
-        maker.buildCFG();
-        OMPCFGResult result = maker.getResult();
-        result.resolve();
-        
-        OMPCFG cfg = new OMPCFG(pragma, 
-                                statement, 
-                                result.getFirstChain(), 
-                                result.getUnconnectedChains(), 
-                                result.getUnresolvedControlFlow(), 
-                                result.getLabelMap());
-
-        
-        pragmaRegionMap_   = null;
-        pragmaLocationMap_ = null;
-        pragmaContext_     = null;
-        return cfg;
-    }
-
-    /**
-     * OMOPCFGMaker - constructor
-     * @param tNode - IASTNode
-     */
-    protected OMPCFGMaker(IASTStatement tNode)
-    {
-        tNode_     = tNode;
-        shouldVisitStatements   = true;
-        shouldVisitDeclarations = true;
-    }
-    
-    /**
-     * OMPCFGMaker  - constructor
-     * @param tNode - IASTNode
-     */
-    protected OMPCFGMaker(IASTExpression tNode)
-    {
-        tNode_                   = tNode;
-        shouldVisitExpressions   = true;
-    }
-    
-    /**
-     * buildCFG - method to initiate building tree using tree walker
-     *
-     */
-    public void buildCFG()
-    {
-        if (tNode_==null)   // this can occur, e.g. blank else part of if
-            firstNode_=currentNode_=new OMPBasicBlock();   // with nothing in it
-        else 
-          tNode_.accept(this);
-        
-        // put the last chain on the list
-        if (currentNode_!=null) {
-            result_.addChain(firstNode_, currentNode_, OMPCFGResult.TermForward, null);
-            currentNode_ = null;
-            firstNode_   = null;
-        }
-
-    }
-    
-    public OMPCFGResult getResult() { return result_;  }
-    
-    /**
-     * visit - for an expression block
-     * @param expression - IASTExpression
-     */
-    public int visit(IASTExpression expression)
-    {
-        // simple for now - may need to drill down later
-        OMPExpressionBlock b = new OMPExpressionBlock();
-        b.setPragmaContext(getLastPragma());
-        b.addExpression(expression);
-        firstNode_=currentNode_=b;
-
-        return PROCESS_CONTINUE;
-    }
-    
-    public int visit(IASTDeclaration declaration)
-    {
-        return PROCESS_CONTINUE;
-    }
-    
-
-    public int visit(IASTStatement statement) 
-    {
-        // first, check if statement is a region for a pragma
-        int checkValue = pragmaRegionCheck(statement);
-        if (checkValue!=-1)  return checkValue;  // -1 means carry foward in this code
-        
-        if (statement instanceof IASTIfStatement) {
-            processIfStatement((IASTIfStatement)statement);
-            pragmaRegionlessCheck(statement, PASTOMPPragma.NeighborProximity);
-            return PROCESS_SKIP;
-        }
-        else if (statement instanceof IASTSwitchStatement) {
-            processSwitchStatement((IASTSwitchStatement)statement);
-            pragmaRegionlessCheck(statement, PASTOMPPragma.NeighborProximity);
-            return PROCESS_SKIP;
-        }
-        else if (statement instanceof IASTCaseStatement) {
-            processCaseStatement((IASTCaseStatement)statement);
-            return PROCESS_CONTINUE;
-        }
-        else if (statement instanceof IASTForStatement) {
-            processForStatement((IASTForStatement)statement);
-            pragmaRegionlessCheck(statement, PASTOMPPragma.NeighborProximity);
-            return PROCESS_SKIP;
-        }
-        else if (statement instanceof IASTWhileStatement) {
-            processWhileStatement((IASTWhileStatement)statement);
-            pragmaRegionlessCheck(statement, PASTOMPPragma.NeighborProximity);
-            return PROCESS_SKIP;
-        }
-        else if (statement instanceof IASTDoStatement) {
-            processDoStatement((IASTDoStatement)statement);
-            pragmaRegionlessCheck(statement, PASTOMPPragma.NeighborProximity);
-            return PROCESS_SKIP;
-        }
-        else if (statement instanceof IASTCompoundStatement) {
-            pragmaRegionlessCheck(statement, PASTOMPPragma.ChildProximity);
-            return PROCESS_CONTINUE;
-        }
-        else if (statement instanceof IASTBreakStatement) {
-            addToBasicBlockAndChain(statement, OMPCFGResult.TermBreak);
-            return PROCESS_CONTINUE;
-        }
-        else if (statement instanceof IASTContinueStatement) {
-            addToBasicBlockAndChain(statement, OMPCFGResult.TermContinue); 
-            return PROCESS_CONTINUE;
-        }
-        else if (statement instanceof IASTReturnStatement) {
-            addToBasicBlockAndChain(statement, OMPCFGResult.TermReturn); 
-            return PROCESS_CONTINUE;
-        }
-        
-        // just add to the current basic block if there is one
-        addToBasicBlock(statement);
-        pragmaRegionlessCheck(statement, PASTOMPPragma.NeighborProximity);
-        
-        return PROCESS_CONTINUE;
-
-    }
-    
-    /**
-     * pragmaRegionCheck - if stmt is region for a preceding pragma, add pragma 
-     * @param statement - IASTStatement
-     * @return int  (-1 means nothing done)
-     */
-    protected int pragmaRegionCheck(IASTStatement statement)
-    {
-        PASTOMPPragma pragma = (PASTOMPPragma)pragmaRegionMap_.get(statement);
-        
-        // The following avoids a nasty recursion loop, resulting from
-        //    the recursion we invest on the following lines, i.e.
-        //    we keep building makers for the same statement
-        if (pragmaContext_.size()!=0 && ((OMPPragmaNode)pragmaContext_.peek()).getPragma()==pragma)
-            return -1;
-        
-        if (pragma!=null) {
-            OMPCFGNode pNode = new OMPPragmaNode(pragma, getLastPragma());
-            pNode.setPragmaContext(getLastPragma());
-            addToChain(pNode);
-            
-            // TODO: Analyse the context here to see if legal OMP pragma makes sense (ret -1)
-             
-            pragmaContext_.push(pNode);   // bump the context
-            
-            // Do a 1 level recursion to process this statement - so we can pop this context
-            OMPCFGMaker maker = new OMPCFGMaker(statement);
-            maker.buildCFG();
-            pragmaContext_.pop();
-            
-            result_.merge(maker.getResult());
-            // in the case of null compound statements, there is nothing here
-            if (maker.getResult().getFirstChain()!=null) {
-              pNode.connectTo(maker.getResult().getFirstChain().getHeadNode());
-              currentNode_ = maker.getResult().getFirstChain().getTailNode();
-            }
-            
-            // For certain pragmas, we will append an implicit barrier
-            int type = pragma.getOMPType();
-            if ((type==PASTOMPPragma.OmpParallel || type==PASTOMPPragma.OmpParallelFor ||
-                type==PASTOMPPragma.OmpParallelSections || type==PASTOMPPragma.OmpSingle) &&
-                pragma.getNoWait()==false) {
-                addToChain(new OMPPragmaNode(), true);  // constructor set implicit barrier
-            }
-                    
-            return PROCESS_SKIP;
-        }
-        
-        return -1;
-    }
-    
-    /**
-     * pragmaRegionlessCheck - add things like barrier, etc. as a separate node
-     * @param statement   - IASTStatement (preceeding the pragma)
-     * @param proximity   - int (see PASTOMPPragma constants, child, neighbor)
-     */
-    protected void pragmaRegionlessCheck(IASTStatement statement, int proximity)
-    {
-        LinkedList l = (LinkedList)pragmaLocationMap_.get(statement);
-        if (l==null)
-            return;
-        
-        for(Iterator i=l.iterator(); i.hasNext();) {
-            PASTOMPPragma oPragma = (PASTOMPPragma)i.next();
-            if (oPragma.getProximity()==proximity && oPragma.getRegion()==null) {
-                OMPCFGNode pNode = new OMPPragmaNode(oPragma, getLastPragma());
-                pNode.setPragmaContext(getLastPragma());
-                addToChain(pNode);
-                // no pop nor push needs to be done here
-            }
-        }
-    }
-    
-    /**
-     * processIfStatement - process the the then and else into a unified result
-     * @param ifs - IASATIfStatement
-     */
-    private void processIfStatement(IASTIfStatement ifs)
-    {
-
-        OMPCFGMaker  ift = new OMPCFGMaker(ifs.getThenClause());
-        OMPCFGMaker  ife = new OMPCFGMaker(ifs.getElseClause());
-        ift.buildCFG();
-        //System.out.println("OMPCFGMaker-----------------------------Else");
-        ife.buildCFG();
-        //System.out.println("OMPCFGMaker-----------------------------Endif");
-        Chain thenChain = ift.getResult().getFirstChain();
-        Chain elseChain = ife.getResult().getFirstChain();
-        
-        // The OMP CFG elides a lot of conditionals to save expense in analysis
-        // See if there is any reason to retain the structure, if not just add
-        // the statement to the current basic block
-        if (!getRelevance(ift.getResult()) && !getRelevance(ife.getResult())) {
-               addToBasicBlock(ifs);
-               return;
-        }
-        
-        addBasicBlockBranch(ifs.getConditionExpression(), OMPBasicBlock.IfBranch);
-        if (traceOn_)
-            System.out.println("CFGFactory: Create IF BranchNode");
-        
-        currentNode_.connectTo(thenChain.getHeadNode());
-        currentNode_.connectTo(elseChain.getHeadNode());
-        // Build a join node to collect results - makes things easier
-        OMPBasicBlock jn = new OMPBasicBlock();
-        jn.setPragmaContext(getLastPragma());
-        if (traceOn_)
-            System.out.println("CFGFactory: Create JoinNode");
-        // connect what they go through
-        if (thenChain.getTerminationReason()==OMPCFGResult.TermForward)
-          thenChain.getTailNode().connectTo(jn);
-        if (elseChain.getTerminationReason()==OMPCFGResult.TermForward)
-          elseChain.getTailNode().connectTo(jn);
-       
-        // merge the nested results into the higher results
-        // note that IF does not settle any unresolved issues
-        result_.merge(ift.getResult());
-        result_.merge(ife.getResult());
-        
-        // add the join to the chain
-        if (jn.hasPredecessors())  // only if used
-          addToChain(jn, false);
-    }
-    
-    
-    /**
-     * processSwitchStatement - build the cfg for a switch statement
-     * @param iss - IASTSwitchStatement
-     */
-    private void processSwitchStatement(IASTSwitchStatement iss)
-    {
-        IASTStatement body = iss.getBody();
-        
-        OMPCFGMaker caseBodyFactory = new OMPCFGMaker(body);
-        caseBodyFactory.buildCFG();
-        OMPCFGResult cBody = caseBodyFactory.getResult();
-        
-        // We try to complete the structure to get rid of all breakages
-        // If there are none, and no barriers, we can just fold the whole switch into the case statement.
-        //    otherwise, we attach the whole mess to the cfg.
-        //
-        // We expect a set of chains.
-        // In each chain, we will look for nodes that begin with a case statement.
-        // If they end in a break or return, they are distinct paths in the case
-        //    otherwise they merge into each other.
-        // 
-        // Build first, token basic blocks for the split and join
-        OMPBasicBlock  bn = new OMPBasicBlock();
-        bn.setPragmaContext(getLastPragma());
-        OMPBasicBlock  jn = new OMPBasicBlock();
-        jn.setPragmaContext(getLastPragma());
-        bn.setBranchingExpression(iss.getControllerExpression(), OMPBasicBlock.SwitchBranch);
-        LinkedList chains      = cBody.getChains();
-        for(Iterator i=chains.iterator(); i.hasNext();) {
-            Chain   chain = (Chain)i.next();
-            OMPCFGNode p  = chain.getHeadNode();
-            while(p!=null) {
-                if (p instanceof OMPBasicBlock) {
-                    if (((OMPBasicBlock)p).isCase())
-                      bn.connectTo(p);
-                }
-                p = p.getSuccessor();
-            }
-        }
-        
-        // for all the breaks, look at unresolved control flow list and deal with it
-        LinkedList ucf = cBody.getUnresolvedControlFlow();
-        Object    [] ucfList = ucf.toArray();  // need this form instead of iterator, due to removal conflict
-        for(int i=0; i<ucfList.length; i++) {
-            Chain urcf = (Chain)ucfList[i];
-            if (urcf.getTerminationReason()==OMPCFGResult.TermBreak) {
-                urcf.getTailNode().connectTo(jn);
-                cBody.removeUnresolvedControlFlow(urcf);
-            }
-         }
-        
-        // Now we see if we have anything of interest in this statement, if not, just fold it into the BB
-        if (!getRelevance(cBody)) {
-            addToBasicBlock(iss);
-            return;
-         }
-        
-        // We need this structure, fold into the exising block structure
-        // merge results for all chains
-        result_.merge(cBody);
-        
-        // add to current chain
-        addToChain(bn, true);
-        // the join does not follow the branch directly - there is stuff inbetween, make it the current node
-        addToChain(jn, false);
-    }
-    
-    /**
-     * processWhileStatement - process the while statement into cfg
-     * @param whileStmt - IASTWhileStatement
-     */
-    private void processWhileStatement(IASTWhileStatement whileStmt)
-    {
-        IASTExpression condition = whileStmt.getCondition();
-        IASTStatement  body      = whileStmt.getBody();
-        
-        OMPCFGMaker       bodyBuilder = new OMPCFGMaker(body);
-        bodyBuilder.buildCFG();
-        OMPCFGResult      cBody       = bodyBuilder.getResult();
-        
-        // As in other stmts, build it all, do a check if we should fold in,
-        //    otherwise, use the nodes
-        OMPBasicBlock  bn        = new OMPBasicBlock();
-        bn.setPragmaContext(getLastPragma());
-        bn.setBranchingExpression(condition, OMPBasicBlock.WhileBranch);
-        OMPBasicBlock  jn        = new OMPBasicBlock();
-        jn.setPragmaContext(getLastPragma());
-        
-        // Build the control flow
-        bn.connectTo(jn);
-        bn.connectTo(cBody.getFirstChain().getHeadNode());
-        cBody.getLastChain().getTailNode().connectTo(bn);
-        
-        // for all the breaks and continues, look at unresolved control flow list and deal with it
-        LinkedList ucf = cBody.getUnresolvedControlFlow();
-        for(Iterator i=ucf.iterator(); i.hasNext();) {
-            Chain urcf = (Chain)i.next();
-            if (urcf.getTerminationReason()==OMPCFGResult.TermBreak) {
-                urcf.getTailNode().connectTo(jn);
-                cBody.removeUnresolvedControlFlow(urcf);
-            }
-            else if (urcf.getTerminationReason()==OMPCFGResult.TermContinue) {
-                urcf.getTailNode().connectTo(bn);
-                cBody.removeUnresolvedControlFlow(urcf);
-            }
-         }
-        
-        // Now we see if we have anything of interest in this statement, if not, just fold it into the BB
-        if (!getRelevance(cBody)) {
-            addToBasicBlock(whileStmt);
-            return;
-        }
-        
-        // merge results for all chains
-        result_.merge(cBody);
-        
-        // add to current chain
-        addToChain(bn, true);
-        addToChain(jn, false);
-    }
-    
-    /**
-     * processDoStatement - process Do statement into cfg
-     * @param doStmt - IASTDoStatement
-     */
-    private void processDoStatement(IASTDoStatement doStmt)
-    {
-        IASTExpression condition = doStmt.getCondition();
-        IASTStatement  body      = doStmt.getBody();
-        
-        OMPBasicBlock  bn   = new OMPBasicBlock();
-        bn.setPragmaContext(getLastPragma());
-        bn.setBranchingExpression(condition, OMPBasicBlock.DoBranch);
-        OMPBasicBlock  jn   = new OMPBasicBlock();
-        jn.setPragmaContext(getLastPragma());
-        
-        OMPCFGMaker       bodyBuilder = new OMPCFGMaker(body);
-        bodyBuilder.buildCFG();
-        OMPCFGResult      cBody       = bodyBuilder.getResult();
- 
-        // Build the graph  [ we still put the join right after branch, to have a "break" target
-        cBody.getLastChain().getTailNode().connectTo(bn);
-        bn.connectTo(cBody.getFirstChain().getHeadNode());
-        bn.connectTo(jn);
-        
-        // Now we see if we have anything of interest in this statement, if not, just fold it into the BB
-        if (!getRelevance(cBody)) {
-            addToBasicBlock(doStmt);
-            return;
-        }
- 
-        
-        // merge results for all chains
-        result_.merge(cBody);
-        
-        // add to current chain
-        addToChain(cBody.getFirstChain().getHeadNode(), true);
-        addToChain(jn, true);
-    }
-    
-    
-    /**
-     * processCaseStatement - Start a new basic block beginning with this case
-     * @param ics - IASTCaseStatement
-     */
-    private void processCaseStatement(IASTCaseStatement ics)
-    {
-        // Create a new basic block; but not a new chain
-        OMPBasicBlock b = new OMPBasicBlock();
-        b.setPragmaContext(getLastPragma());
-        addToChain(b);
-        if (traceOn_)
-            System.out.println("CFGFactory: Create BasicBlock due to case statement");
-        ((OMPBasicBlock)currentNode_).addStatement(ics);
-    }
-    
-    /**
-     * processForStatement - build the graph for the For statement
-     * @param ifs
-     */
-    private void processForStatement(IASTForStatement forStmt)
-    {
-        // TODO: there are cases where any of the following can be empty - to handle
-        IASTStatement  initializer = forStmt.getInitializerStatement();
-        IASTExpression condition   = forStmt.getConditionExpression();
-        IASTExpression iteration   = forStmt.getIterationExpression();
-        IASTStatement  body        = forStmt.getBody();
-        
-        // We will build the final result, than analyse if we actually need this
-        OMPBasicBlock       bn = new OMPBasicBlock();
-        bn.setBranchingExpression(condition, OMPBasicBlock.ForBranch);
-        OMPBasicBlock       jn = new OMPBasicBlock();
-       
-        OMPCFGMaker  initBuilder = new OMPCFGMaker(initializer);
-        initBuilder.buildCFG();
-        OMPCFGResult cInit = initBuilder.getResult(); 
-        
-        OMPCFGMaker forBodyFactory = new OMPCFGMaker(body);
-        forBodyFactory.buildCFG();
-        OMPCFGResult cBody = forBodyFactory.getResult();
-        
-        OMPCFGMaker iterBodyFactory = new OMPCFGMaker(iteration);
-        iterBodyFactory.buildCFG();
-        OMPCFGResult cIter = iterBodyFactory.getResult();
-        
-        // Build the primary structure of the loop
-        cInit.getLastChain().getTailNode().connectTo(bn);
-        bn.connectTo(jn);
-        bn.connectTo(cBody.getFirstChain().getHeadNode());
-        cBody.getLastChain().getTailNode().connectTo(cIter.getFirstChain().getHeadNode());
-        cIter.getLastChain().getTailNode().connectTo(bn);
-        
-        // for all the breaks and continues, look at unresolved control flow list and deal with it
-        LinkedList ucf = cBody.getUnresolvedControlFlow();
-        Object [] uList = ucf.toArray();
-        for(int i=0; i<uList.length; i++) {
-            Chain urcf = (Chain)uList[i];
-            if (urcf.getTerminationReason()==OMPCFGResult.TermBreak) {
-                urcf.getTailNode().connectTo(jn);
-                cBody.removeUnresolvedControlFlow(urcf);
-            }
-            else if (urcf.getTerminationReason()==OMPCFGResult.TermContinue) {
-                urcf.getTailNode().connectTo(cIter.getFirstChain().getHeadNode());
-                cBody.removeUnresolvedControlFlow(urcf);
-            }
-         }
-        
-        // Now we check if we are all resolved - only check the body
-        if (!getRelevance(cBody)) {
-            addToBasicBlock(forStmt);
-            return;
-         }
-        
-        // Otherwise we add all this into the control flow graph
-        
-        // merge results for all chains
-        result_.merge(cInit);
-        result_.merge(cIter);
-        result_.merge(cBody);
-        
-        // add to current chain
-        addToChain(cInit.getFirstChain().getHeadNode(), true);
-        addToChain(bn, true);
-        addToChain(jn, false);    // bn already connected to jn
-    }
-    
-    /**
-     * getRelevance - Look at result for existence of pragmas, or 
-     *                of labels, or of unresolved control flow
-     * @param result - OMPCFGResult
-     * @return - boolean (true means any of the above exist
-     */
-    protected boolean getRelevance(OMPCFGResult result)
-    {
-        boolean tf = (result.getNumberOfPragmas()!=0 ||
-                      result.getNumberOfLabels()!=0  ||
-                      result.getUnresolvedControlFlow().size()!=0);
-        return tf;
-    }
-    
-    protected OMPPragmaNode getLastPragma()
-    {
-        return (pragmaContext_.isEmpty() ? null : (OMPPragmaNode)pragmaContext_.peek());
-    }
-    
-    /**
-     * addToBasicBlock - add a statement to the basic block
-     * @param statement - IASTStatement
-     */
-    private void addToBasicBlock(IASTStatement statement)
-    {
-        // default case, we are either adding a statement to a current basic block
-        if (currentNode_==null || !(currentNode_ instanceof OMPBasicBlock)) {
-            OMPBasicBlock b = new OMPBasicBlock();
-            b.setPragmaContext(getLastPragma());
-            addToChain(b);
-           // currentNode_ = new BasicBlock();
-            if (traceOn_)
-                System.out.println("CFGFactory: Create BasicBlock");
-            //firstNode_   = currentNode_;
-        }
-        ((OMPBasicBlock)currentNode_).addStatement(statement);
-     }
-    
-    private void addBasicBlockBranch(IASTExpression expression, int type)
-    {
-        // Add a new BB if the current is null, or is not a basic block
-        if (currentNode_==null || !(currentNode_ instanceof OMPBasicBlock)) {
-            addToChain(new OMPBasicBlock(), true);
-            if (traceOn_)
-                System.out.println("CFGFactory: Create BasicBlock");
-       }
-        assert(((OMPBasicBlock)currentNode_).getBranchingExpression()==null);
-       ((OMPBasicBlock)currentNode_).setBranchingExpression(expression, type);
-    }
-
-    /**
-     * addToCurrentChain - add the CFGNode to the current chain
-     * @param node - OMPCFGNode
-     * @param connect - connect to prior node
-     */
-    private void addToChain(OMPCFGNode node, boolean connect)
-    {
-        if (firstNode_==null) {
-            firstNode_   = node;
-            currentNode_ = node;
-        }
-        else {
-            if (connect)
-              currentNode_.connectTo(node);
-            currentNode_ = node;
-        }
-    }
-
-    /**
-     * addToChain - short hand to add and connect to chain
-     * @param node
-     */
-    private void addToChain(OMPCFGNode node) { addToChain(node, true); }
-     
-    private void addToBasicBlockAndChain(IASTStatement statement, int termReason)
-    {
-        addToBasicBlock(statement);
-        Chain chain = result_.addChain(firstNode_, currentNode_, termReason, statement);
-        if (termReason==OMPCFGResult.TermBreak || termReason==OMPCFGResult.TermContinue ||
-            termReason==OMPCFGResult.TermReturn)
-            result_.addUnresolvedControlFlow(chain);
-        currentNode_ = null;
-        firstNode_   = null;
-    }
-
-
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/OMPCFGResult.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/OMPCFGResult.java
deleted file mode 100644
index 768f7ce..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/OMPCFGResult.java
+++ /dev/null

@@ -1,249 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.LinkedList;
-
-import org.eclipse.cdt.core.dom.ast.IASTGotoStatement;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPBasicBlock;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPCFGNode;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPPragmaNode;
-
-/**
- * Collects information about each pass of OMPCFGmaker
- * 
- * @author pazel
- *
- */
-public class OMPCFGResult
-{
-    /** List of sequential chains in 1-level pass: the control flow between
-    * chains is broken by continue, break, return, or goto
-    */
-    protected LinkedList chains_            = new LinkedList();  // of Chain
-    /** List of chains with no sequential flow to entry point - these get 
-    * aggregated.   Could be dead code, but could be branched into.
-    */
-    protected LinkedList unconnectedChains_ = new LinkedList();  // of Chain
-    /** List of blocks ending in continue, break, return, or goto whose further
-    * continuation needs to be resolved
-    */
-    protected LinkedList unresolvedControlFlow_ = new LinkedList();  // of Chain
-    /** list of labeled blocks (and related chain) */
-    protected Hashtable labelMap_              = new Hashtable();  // IASTName->LabeledBlock
-    /** list of pragma nodes encountered */
-    protected LinkedList pragmaNodeList_       = new LinkedList();
-    
-    /** block termination reason - unknown */
-    public static final int TermUnknown = -1;
-    /** block termination reason - no termination */
-    public static final int TermForward = 0;    // no termination
-    /** block termination reason - continue */
-    public static final int TermContinue = 1;   // continue
-    /** block termination reason - break */
-    public static final int TermBreak    = 2;   // break
-    /** block termination reason - return */
-    public static final int TermReturn   = 3;   // return
-    /** block termination reason - goto */
-    public static final int TermGoto     = 4;   // goto
-    
-    /**
-     * OMPCFGResult - constructor
-     *
-     */
-    public OMPCFGResult() { }
-    
-    /**
-     * addChain - add a chain to the chainList
-     * @param headNode
-     * @param tailNode
-     * @param terminationReason
-     * @param termStmt
-     */
-    public Chain addChain(OMPCFGNode headNode, 
-                          OMPCFGNode tailNode, 
-                          int terminationReason,
-                          IASTStatement termStmt)
-    {
-        Chain chain = new Chain(headNode, tailNode, terminationReason, termStmt);
-        chains_.add(chain);
-        
-        // run through chain to find all labeled blocks and add to labelmap
-        addLabels(chain);
-        addPragmas(chain);
-        return chain;
-    }
-    
-    /**
-     * addChain - add a chain to this result
-     * @param chain - Chain
-     * @return Chain
-     */
-    public Chain addChain(Chain chain)
-    {
-        chains_.add(chain);
-        addLabels(chain);
-        addPragmas(chain);
-        return chain;
-    }
-    
-    private void addLabels(Chain chain)
-    {
-        OMPCFGNode node = chain.getHeadNode();
-        while(node!=null) {
-            if (node instanceof OMPBasicBlock) {
-                IASTName label = ((OMPBasicBlock)node).getLabel();
-                if (label!=null) {
-                    if (!labelMap_.containsKey(label))
-                       labelMap_.put(label, new LabeledBlock(node, chain));
-                }
-            }
-            node=node.getSuccessor();  // use this knowing each node has a follower
-        }
-    }
-    
-    private void addPragmas(Chain chain)
-    {
-        OMPCFGNode node = chain.getHeadNode();
-        while(node!=null) {
-            if (node instanceof OMPPragmaNode) {
-                if (!pragmaNodeList_.contains(node))
-                   pragmaNodeList_.add(node);
-            }
-            node=node.getSuccessor();  // use this knowing each node has a follower
-        }
-    }
-    
-    public void merge(OMPCFGResult result)
-    {
-        // we don't merge chains_;
-        
-        // we merge all the others
-        unconnectedChains_.addAll(result.getUnconnectedChains());
-        unresolvedControlFlow_.addAll(result.getUnresolvedControlFlow());
-        labelMap_.putAll(result.getLabelMap());
-        pragmaNodeList_.addAll(result.getPragmaNodeList());
-    }
-    
-    public void resolve()
-    {
-        // Usually done to the final cfg results
-        // we try to resolve all unresolved control flow (goto's) and 
-        // return/exit nodes (sink)
-        // and maybe flag all unconnected chains as dead code
-        
-        for(Iterator i=unresolvedControlFlow_.iterator(); i.hasNext(); ) {
-            Chain uChain = (Chain)i.next();
-            if (uChain.getTerminationReason()==TermGoto) {
-                IASTStatement tStmt = uChain.getTerminationStmt();
-                if (tStmt!=null && (tStmt instanceof IASTGotoStatement)) {
-                    IASTName targetLabel = ((IASTGotoStatement)tStmt).getName();
-                    OMPCFGNode lNode = (OMPCFGNode)labelMap_.get(targetLabel);
-                    if (lNode!=null) {
-                        uChain.getTailNode().connectTo(lNode);
-                        removeUnresolvedControlFlow(uChain);
-                    }
-                }
-            }
-        }
-    }
-    
-    public void addUnconnectedChain(Chain chain)
-    {
-        unconnectedChains_.add(chain);
-    }
-    
-    public void addUnresolvedControlFlow(Chain chain)
-    {
-        unresolvedControlFlow_.add(chain);
-    }
-    
-    public void removeUnresolvedControlFlow(Chain chain)
-    {
-        unresolvedControlFlow_.remove(chain);
-    }
-    
-    public int getNumberOfLabels()
-    {
-        return labelMap_.size();
-    }
-    
-    public int getNumberOfPragmas()
-    {
-        return pragmaNodeList_.size();
-    }
-    
-    // accessors
-    public LinkedList getChains()  {  return chains_;  }
-    public LinkedList getUnconnectedChains() { return unconnectedChains_; }
-    public LinkedList getUnresolvedControlFlow() { return unresolvedControlFlow_; }
-    public Hashtable  getLabelMap() { return labelMap_; }
-    public LinkedList getPragmaNodeList() { return pragmaNodeList_; }
-    
-    /**
-     * Get the very first chain - a common want in the code (other are dead code)
-     * @return Chain
-     */
-    public Chain      getFirstChain() { return (chains_.size()>0 ? (Chain)(chains_.getFirst()) : null); }
-    /**
-     * Get the very last chain - a common want in the code (other are dead code)
-     * @return Chain
-     */
-    public Chain      getLastChain()  { return (chains_.size()>0 ? (Chain)(chains_.getLast())  : null);  }
-    
-    
-    /**
-     *  Chain - qualifies a code chain
-     *
-     */
-    static public class Chain
-    {
-        protected OMPCFGNode    headNode_ = null;
-        protected OMPCFGNode    tailNode_ = null;
-        protected int           terminationReason_ = TermUnknown;
-        protected IASTStatement terminationStmt_  = null;
-        
-        public Chain(OMPCFGNode headNode, OMPCFGNode tailNode, int terminationReason, IASTStatement termStatement)
-        {
-            headNode_=headNode;  tailNode_=tailNode;  
-            terminationReason_ = terminationReason; terminationStmt_ = termStatement;
-        }
-        
-        /** Get head node in the Chain */
-        public OMPCFGNode getHeadNode() { return headNode_; }
-        
-        /** Get tail node in the Chain */
-        public OMPCFGNode getTailNode() { return tailNode_; }
-        public int     getTerminationReason() { return terminationReason_; }
-        public IASTStatement getTerminationStmt() { return terminationStmt_; }
-    }
-    
-    /** LabeledBlock - qualifies a block with a label */
-    static public class LabeledBlock
-    {
-        protected OMPCFGNode labeledBlock_ = null;
-        protected Chain      relatedChain_ = null;  // chain holding block
-        
-        public LabeledBlock(OMPCFGNode labeledBlock, Chain relatedChain)
-        {
-            labeledBlock_ = labeledBlock;
-            relatedChain_ = relatedChain;
-        }
-        
-        public OMPCFGNode getLabeledBlock()  { return labeledBlock_; }
-        public Chain      getRelatedChain()  { return relatedChain_; }
-    }
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/PASTSemanticCheck.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/PASTSemanticCheck.java
deleted file mode 100644
index 3e91fee..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/PASTSemanticCheck.java
+++ /dev/null

@@ -1,294 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory;
-import org.eclipse.ptp.pldt.openmp.analysis.OpenMPError;
-import org.eclipse.ptp.pldt.openmp.analysis.OpenMPErrorManager;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTOMPPragma;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPCFG;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPCFGNode;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPDFS;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPPragmaNode;
-
-/**
- * Look for common semantic errors
- * 
- * @author pazel
- *
- */
-public class PASTSemanticCheck
-{
-    protected int numErrors_ = 0;
-    
-    protected PASTSemanticCheck(OMPCFG cfg)
-    {
-        SemanticDFS dfs = new SemanticDFS(cfg.getRoot());
-        dfs.startWalking();
-        
-    }
-
-    public static boolean checkSemantics(OMPCFG cfg)
-    {
-        PASTSemanticCheck psc = new PASTSemanticCheck(cfg);
-        return psc.getNumErrors()==0 ? true : false;
-    }
-    
-    public int getNumErrors()
-    {
-        return numErrors_;
-    }
-    
-    private void checkPragmaSemantics(OMPPragmaNode pnode)
-    {
-        PASTOMPPragma pragma = pnode.getPragma();
-        if (pragma==null)  // implicit barrier
-            return;
-        
-        switch(pragma.getOMPType()) {
-            // followed by structured region
-            case PASTOMPPragma.OmpParallel:
-               parallelCheck(pnode);
-               break;
-            case PASTOMPPragma.OmpSections:
-            case PASTOMPPragma.OmpSection:
-            case PASTOMPPragma.OmpParallelSections:
-            case PASTOMPPragma.OmpSingle:
-                break;
-            case PASTOMPPragma.OmpMaster:
-                masterCheck(pnode);
-                break;
-            case PASTOMPPragma.OmpCritical:
-                break;
-            case PASTOMPPragma.OmpOrdered:
-                orderedCheck(pnode);
-                break;
-                
-            // Must be followed by FOR
-            case PASTOMPPragma.OmpFor:
-            case PASTOMPPragma.OmpParallelFor:
-                forCheck(pnode);
-                break;
-
-            // Stands alone
-            case PASTOMPPragma.OmpBarrier:
-                barrierCheck(pnode);
-                break;
-            case PASTOMPPragma.OmpFlush:
-            case PASTOMPPragma.OmpThreadPrivate:
-                break;
-            
-            // Followed by expression
-            case PASTOMPPragma.OmpAtomic:
-                break;
-            case PASTOMPPragma.OmpUnknown:
-                return;  
-        }
-        return;
-    }
-    
-    /**
-     * parallelCheck - semantic check for Parallel statements
-     * @param pnode - OMPPragmaNode
-     */
-    private void parallelCheck(OMPPragmaNode pnode)
-    {
-        // A parallel directive dynamically inside another parallel
-        // logically etablishes a new team which is composed of only the current thread,
-        // unless nested parallelism is enabled.
-        OMPPragmaNode parent = pnode.getContextPredecessor();
-        while(parent!=null) {
-            int pType = parent.getPragma().getOMPType();
-            if (pType==PASTOMPPragma.OmpParallel ||
-                pType==PASTOMPPragma.OmpParallelFor ||
-                pType==PASTOMPPragma.OmpParallelSections) {
-                handleProblem(pnode.getPragma(), 
-                        "Parallel directive dynamically inside another parallel, establishes single thread context",
-                        OpenMPError.WARN);
-                numErrors_++;
-                break;
-            }
-            parent = parent.getContextPredecessor();
-        }
-        return;
-    }
-    
-    /**
-     * forCheck - Semantic check for For/parallelFor semantic mistakes
-     * @param pnode - OMPPragmaNode (for for/parallelFor)
-     */
-    private void forCheck(OMPPragmaNode pnode)
-    {
-        // A for directive is not allowed to nest with another for, sections, 
-        // and single directive bound to the same parallel 
-        // neither for ritical, ordered, and master regions
-        PASTOMPPragma pragma = pnode.getPragma();
-        boolean       isParallel = (pragma.getOMPType()==PASTOMPPragma.OmpParallelFor);
-        OMPPragmaNode parent = pnode.getContextPredecessor();
-        boolean       errorFound=false;
-        while(parent!=null) {
-            int parentType = parent.getPragma().getOMPType();
-            if (!errorFound) { 
-               if (parentType==PASTOMPPragma.OmpFor ||
-                   parentType==PASTOMPPragma.OmpSections ||
-                   parentType==PASTOMPPragma.OmpSingle) {
-                 errorFound=true; 
-               }
-               else if (parentType==PASTOMPPragma.OmpCritical ||
-                        parentType==PASTOMPPragma.OmpOrdered  ||
-                        parentType==PASTOMPPragma.OmpMaster) {
-                   handleProblem(pnode.getPragma(), 
-                           "For directive embedded within critical, ordered, or master extents",
-                           OpenMPError.ERROR);
-                   numErrors_++;
-                   errorFound=true;
-                   break;
-                }
-               else if (parentType==PASTOMPPragma.OmpParallelFor ||
-                        parentType==PASTOMPPragma.OmpParallelSections) {
-                   handleProblem(pnode.getPragma(), 
-                           "For directive embedded within another parallel for or parallel sections",
-                           OpenMPError.ERROR);
-                   numErrors_++;
-                   errorFound=true;
-                   break;
-               }
-               else if (isParallel && parentType==PASTOMPPragma.OmpParallel) {
-                   handleProblem(pnode.getPragma(), 
-                           "Parallel directive dynamically inside another parallel, establishes single thread context",
-                           OpenMPError.WARN);
-                   numErrors_++;
-                   break;                 
-               }
-            }
-            if (errorFound && (parentType==PASTOMPPragma.OmpParallel ||
-                               parentType==PASTOMPPragma.OmpParallelFor ||
-                               parentType==PASTOMPPragma.OmpParallelSections))
-            {
-                handleProblem(pnode.getPragma(), 
-                        "For directive embedded within another for, sections, or single directive",
-                        OpenMPError.ERROR);
-                numErrors_++;
-                break;
-             }
-            parent = parent.getContextPredecessor();
-        }
-        return;
-    }
-    
-    /**
-     * barrierCheck - semantic check on barrier statement
-     * @param pnode - OMPPragmaNode
-     */
-    private void barrierCheck(OMPPragmaNode pnode)
-    {
-        // Barrier directives are not permitted in the dynamic extent of for, ordered, sections, single,
-        // master, and critical regions
-        OMPPragmaNode parent = pnode.getContextPredecessor();
-        while(parent!=null) {
-            int pType = parent.getPragma().getOMPType();
-            if (pType==PASTOMPPragma.OmpFor || pType==PASTOMPPragma.OmpParallelFor ||
-                pType==PASTOMPPragma.OmpOrdered || pType==PASTOMPPragma.OmpSections ||
-                pType==PASTOMPPragma.OmpSingle  || pType==PASTOMPPragma.OmpMaster ||
-                pType==PASTOMPPragma.OmpCritical) {
-                handleProblem(pnode.getPragma(), 
-                        "Barrier directive not permitted in region extent of for, ordered, sections, single, master, and critical",
-                        OpenMPError.ERROR);
-                numErrors_++;
-                break;
-             }
-            parent = parent.getContextPredecessor();
-        }
-        return;
-    }
-    
-    /**
-     * masterCheck - semantic check for use of master directive
-     * @param pnode - OMPPragmaNode
-     */
-    private void masterCheck(OMPPragmaNode pnode)
-    {
-        // Master directives are not permitted in the dynamic extent of 
-        // for, sections, and single
-        OMPPragmaNode parent = pnode.getContextPredecessor();
-        while(parent!=null) {
-            int pType = parent.getPragma().getOMPType();
-            if (pType==PASTOMPPragma.OmpFlush || pType==PASTOMPPragma.OmpParallelFor ||
-                pType==PASTOMPPragma.OmpSections || pType==PASTOMPPragma.OmpParallelSections ||
-                pType==PASTOMPPragma.OmpSingle) {
-                handleProblem(pnode.getPragma(), 
-                        "Master directive not permitted in dynamic extent of for, sections, or single directives",
-                        OpenMPError.ERROR);
-                numErrors_++;
-                break;
-            }
-            parent = parent.getContextPredecessor();
-        }
-        return;
-    }
-    
-    /**
-     * orderedCheck - semantic check on ordered directive
-     * @param pnode - OMPPragmaNode
-     */
-    private void orderedCheck(OMPPragmaNode pnode)
-    {
-        // Ordered directives are not permitted in the dynamic extend of critical regions 
-        OMPPragmaNode parent = pnode.getContextPredecessor();
-        while(parent!=null) {
-            int pType = parent.getPragma().getOMPType();
-            if (pType==PASTOMPPragma.OmpCritical) {
-                handleProblem(pnode.getPragma(), 
-                        "Ordered directive not permitted in dynamic extent of critical region",
-                        OpenMPError.ERROR);
-                numErrors_++;
-                break;
-            }
-            parent = parent.getContextPredecessor();
-        }
-        return;
-    }
-    
-    
-    /**
-     * handleProblem
-     * @param description - String
-     * @param severity    - int
-     */
-    private void handleProblem(PASTOMPPragma pragma, String  description, int severity)
-    {
-        OpenMPError error = new OpenMPError(description, 
-                                            pragma.getContainingFilename(),
-                                            pragma.getStartingLine(),
-                                            severity);
-        OpenMPErrorManager.getCurrentErrorManager().addError(error);
-        pragma.addProblem(error);  // we really don't need this, but may be useful later
-    }
-
-    
-    
-    private class SemanticDFS extends OMPDFS
-    {
-        
-        public SemanticDFS(OMPCFGNode startNode)
-        {
-            super(startNode);
-        }
-
-
-        public int visit(OMPCFGNode node)
-        {
-            if (node instanceof OMPPragmaNode) 
-                checkPragmaSemantics((OMPPragmaNode)node);
-            return 0;
-        }
-        
-    }
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/PhaseAnalysisFactory.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/PhaseAnalysisFactory.java
deleted file mode 100644
index 50d114d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/PhaseAnalysisFactory.java
+++ /dev/null

@@ -1,263 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory;
-
-
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Stack;
-
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTOMPPragma;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPCFG;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPCFGNode;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPDFS;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPPragmaNode;
-
-/**
- * Main Algorithm - 
- * 
- * Given: the start node of a control flow graph (OMPCFG)
- * Output: a set of barrier phases
- * 
- * 1) Start the algorithm using the start node of the cfg
- * 2) For each barrier reached by a DFS, said barrier neither prior processed 
- *    nor on the stack, push onto stack, and start fresh DFS on new barrier
- * 3) For each node encountered
- *    a) if node is in a phase having its initial barrier match with top barrier
- *       on the stack, add all nodes after that top barrier to that phase.
- *    b) if node is a barrier, build phase, add nodes on stack from penultimate 
- *       barrier
- * 4) When a DFS completes, pop the stack
- * 5) Terminate when the stack is empty            
- * 
- */
-
-public class PhaseAnalysisFactory
-{
-    protected OMPCFG     cfg_              = null;
-    protected OMPCFGNode termNode_         = null;
-    
-    protected Stack      barrierStack_     = new Stack();       // of DFSWalk's
-    protected HashSet    finishedBarriers_ = new HashSet();     // of barriers that are finished being 
-                                                                //   traversed from
-    protected LinkedList phases_           = new LinkedList();  // of PhaseConcurrencyAnalysis's
-    
-    // A common search we do is, for a given node, and a given barrier, find all 
-    // phases that 
-    //   a) contain that node
-    //   b) have that barrier as the starting barrier of the phase
-    // Solution: map each node to a list of phases to which it belongs.
-    //           The list should be sparse, for filtering out the phases that 
-    //           begin with a particular barrier should be inexpensive.
-    protected Hashtable  nodeToPhases_ = new Hashtable();
-
-    /**
-     * PhaseAnalysisFactory - Constructor
-     * @param cfg - OMPCFG
-     */
-    public PhaseAnalysisFactory(OMPCFG cfg)
-    {
-        cfg_      = cfg;
-        termNode_ = cfg_.getTermNode();
-    }
-    
-    public void buildPhases()
-    {
-        // Set up the first statement
-        OMPCFGNode node = cfg_.getRoot();
-        if (!(node instanceof OMPPragmaNode))  return;   // required
-        DFSWalk pc = new DFSWalk((OMPPragmaNode)node);
-        barrierStack_.push(pc);
-        pc.trigger();
-    }
-    
-    /**
-     * findPhase - find a specified phase and add it
-     * @param bNode - OMPPragmaNode
-     * @param eNode - OMPPragmaNode
-     * @param addNew - boolean
-     * @return PhaseConcurrencyAnalysis
-     */
-    protected PhaseConcurrencyAnalysis findPhase(OMPPragmaNode bNode, OMPPragmaNode eNode, boolean addNew)
-    {
-        // Find the phase that starts and ends with these TODO: make more efficient
-        for(Iterator i=phases_.iterator(); i.hasNext();) {
-            PhaseConcurrencyAnalysis phase = (PhaseConcurrencyAnalysis)i.next();
-            if (phase.getBeginNode()==bNode && phase.getEndNode()==eNode)
-                return phase;
-        }
-        if (!addNew) return null;
-        
-        PhaseConcurrencyAnalysis phase = new PhaseConcurrencyAnalysis(bNode, eNode);
-        phases_.add(phase);
-        return phase;
-    }
-    
-    /**
-     * addNodesToPhase - add a list of nodes to a specific phase
-     * @param phase - PhaseConcurrencyAnalysis
-     * @param nodes - OMPCFGNode []
-     */
-    protected void addNodesToPhase(PhaseConcurrencyAnalysis phase, OMPCFGNode [] nodes)
-    {
-        for(int i=0; i<nodes.length; i++) {
-            phase.add(nodes[i]);
-            mapNodeToPhase(nodes[i], phase);
-        }
-    }
-    
-    protected boolean isFinished(OMPPragmaNode pNode)
-    {
-        return finishedBarriers_.contains(pNode);
-    }
-    
-    protected boolean isOnBarrierStack(OMPPragmaNode pNode)
-    {
-        for(Iterator i=barrierStack_.iterator(); i.hasNext();) {
-            DFSWalk dw = (DFSWalk)i.next();
-            if (dw.getPragmaNode()==pNode)  return true;
-        }
-        return false;
-    }
-    
-    protected LinkedList memberPhases(OMPCFGNode node)
-    {
-        return (LinkedList)nodeToPhases_.get(node);
-    }
-    
-    
-    /**
-     * mapNodeToPhase - map a given node to a given phase in the node-phase map
-     * @param node   - OMPCFGNode
-     * @param phase  - PhaseConcurrencyAnalysis
-     */
-    protected void mapNodeToPhase(OMPCFGNode node, PhaseConcurrencyAnalysis phase)
-    {
-        LinkedList l = (LinkedList)nodeToPhases_.get(node);
-        if (l==null) {
-            l= new LinkedList();
-            nodeToPhases_.put(node, l);
-        }
-        if (!l.contains(phase))
-          l.add(phase);
-    }
-    
-    /**
-     * getPhases - produce a list of all phases produced from this analysis
-     * @return PhaseConcurrencyAnalysis []
-     */
-    public PhaseConcurrencyAnalysis [] getPhases()
-    {
-        PhaseConcurrencyAnalysis [] l = new PhaseConcurrencyAnalysis[phases_.size()];
-        int count = 0;
-        for(Iterator i=phases_.iterator(); i.hasNext();)
-            l[count++] = (PhaseConcurrencyAnalysis)i.next();
-        return l;
-    }
-    
-    //*************************************************************************
-    // DFSWalk
-    //*************************************************************************
-    protected class DFSWalk extends OMPDFS
-    {
-        protected OMPPragmaNode    phaseBeginNode_ = null;
-        
-        public DFSWalk(OMPPragmaNode phaseBeginNode)
-        {
-            super(phaseBeginNode);
-            phaseBeginNode_ = phaseBeginNode;
-        }
-        
-        public OMPPragmaNode getPragmaNode()
-        {
-            return phaseBeginNode_;
-        }
-        
-        /**
-         * trigger - begin the process of walking the graph
-         *
-         */
-        public void trigger()
-        {
-            this.startWalking();
-        }
-        
-        /**
-         * visit - visit method - what the user usually overrides
-         * @param node - OMPCFGNode
-         * @return int  (see OMPDFS codes)
-         */
-        public int visit(OMPCFGNode node)
-        {
-            if (node instanceof OMPPragmaNode) { 
-                OMPPragmaNode pragmaNode = (OMPPragmaNode)node;
-                if (pragmaNode.getPragma()!=null && pragmaNode.getPragma().getOMPType()!=PASTOMPPragma.OmpBarrier)
-                    return OMPDFS.CONTINUE;
-                // If at beginning of stack again, keep moving on
-                if (getNodeStackSize()==1)  return OMPDFS.CONTINUE;
-                // If necessary, create a new phase and add to list of phases
-                PhaseConcurrencyAnalysis phase = findPhase(phaseBeginNode_, pragmaNode, true);
-                addNodesToPhase(phase, getNodeStack());
-                // If barrier is completed or is on stack, we skip searching forward
-                if (isFinished(pragmaNode) || isOnBarrierStack(pragmaNode)) 
-                    return OMPDFS.SKIP;
-                // Create a new walk to the next segments - increase the stack
-                // NOTE: we may have to skip the followin for implict barrier
-                DFSWalk pc = new DFSWalk(pragmaNode);
-                barrierStack_.push(pc);
-                pc.trigger();
-                // above finished walking, pop the stack, and skip on this level
-                barrierStack_.pop();
-                return OMPDFS.SKIP;
-            }
-            else if (node==termNode_) {  // this is an implicit barrier, but not further dfs
-                if (getNodeStackSize()==1)  return OMPDFS.CONTINUE;
-                return OMPDFS.CONTINUE;
-            }
-            
-            // For each visited successor node, add node stack to all phases the successor
-            //    belongs to, said successor phase beginning with phaseBeginNode_
-            // Note: we should not bother with phases that begin with other than phaseBeginNode_ - 
-            //       as then we would have to account for partial paths from other such phases,
-            //       which we do not have (we glom all nodes together, no paths).  That was why
-            //       we do fresh searches starting at new barriers.
-            OMPCFGNode [] nodes = node.getOutNodes();
-            for(int i=0; i<nodes.length; i++) {
-                if (isVisited(nodes[i])) {
-                    LinkedList l = memberPhases(nodes[i]);
-                    OMPCFGNode [] nodeStack = getNodeStack();
-                    Object [] listArray = l.toArray();  // safer to use this, l may get modified
-                    for(int j=0; j<listArray.length; j++) {
-                        PhaseConcurrencyAnalysis phase = (PhaseConcurrencyAnalysis)listArray[j];
-                        if (phase.getBeginNode()==phaseBeginNode_) 
-                            addNodesToPhase(phase, nodeStack);
-                    }
-                }
-            }
-            
-            return OMPDFS.CONTINUE;
-        }
-        
-        /**
-         * atStartNode - check if we are at the 1st node of the search
-         * @param node
-         * @return
-         */
-        protected boolean atStartNode(OMPCFGNode node)
-        {
-            return (node==phaseBeginNode_ && getNodeStackSize()==1);
-        }
-
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/PhaseConcurrencyAnalysis.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/PhaseConcurrencyAnalysis.java
deleted file mode 100644
index 9e1668a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/PhaseConcurrencyAnalysis.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory;
-import java.io.PrintStream;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPCFGNode;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPPragmaNode;
-
-/**
- * Identifies a pair of barriers, and a set of all nodes in-between
-
- * @author pazel
- *
- */
-public class PhaseConcurrencyAnalysis
-{
-    // The bounds of this phase
-    protected OMPPragmaNode    beginNode_ = null;
-    protected OMPPragmaNode    endNode_   = null;
-    // The following are the concurrent OMPCFGnode's to this phase
-    protected LinkedHashSet    nodes_ = new LinkedHashSet();
-   
-    /**
-     * PhaseConcurrencyAnalysis - constructor
-     * @param beginNode - OMPPragmaNode
-     * @param endNode   - OMPPragmaNode
-     */
-    public PhaseConcurrencyAnalysis(OMPPragmaNode beginNode, OMPPragmaNode endNode)
-    {
-        beginNode_ = beginNode;
-        endNode_   = endNode;
-    }
-     
-    /**
-     * getBeginNode - get the first delimiting barrier node
-     * @return OMPPragmaNode
-     */
-    public OMPPragmaNode getBeginNode()
-    {
-        return beginNode_;
-    }
-    
-    /**
-     * getEndNode - get the end delimiting barrier node
-     * @return
-     */
-    public OMPPragmaNode getEndNode()
-    {
-        return endNode_;
-    }
-    
-    /**
-     * add - add a node to the phase
-     * @param node - OMPCFGNode
-     */
-    public void add(OMPCFGNode node)
-    {
-        if (!nodes_.contains(node))
-            nodes_.add(node);
-    }
-    
-    /**
-     * getNodes - get the set of nodes
-     * @return Set
-     */
-    public Set getNodes()
-    {
-        return nodes_;
-    }
-    
-    public void printPhase(PrintStream ps)
-    {
-        ps.println("Begin pragma ("+beginNode_.getId()+")="+beginNode_.getType());
-        ps.println("End   pragma ("+endNode_.getId()+")="+endNode_.getType());
-        ps.print("   nodes=");
-        for(Iterator i=nodes_.iterator(); i.hasNext();) {
-            OMPCFGNode n = (OMPCFGNode)i.next();
-            ps.print(n.getId()+" ");
-        }
-        ps.println();
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/RegionConcurrencyAnalysis.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/RegionConcurrencyAnalysis.java
deleted file mode 100644
index 3e39f6f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/RegionConcurrencyAnalysis.java
+++ /dev/null

@@ -1,116 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory;
-
-import java.io.PrintStream;
-import java.util.Set;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPCFG;
-
-/**
- * Holds the analysis for a portion of a function defined by an omp pragma
- * 
- * @author pazel
- * 
- */
-public class RegionConcurrencyAnalysis {
-	protected FunctionConcurrencyAnalysis analysis_ = null; // owning analysis
-
-	protected OMPCFG cfg_ = null;
-
-	protected PhaseConcurrencyAnalysis[] phases_ = null;
-
-	protected RegionConcurrencyMap cMap_ = null;
-
-	/**
-	 * RegionConcurrencyAnalysis - Constructor
-	 * 
-	 * @param cfg -
-	 *            OMPCFG
-	 */
-	public RegionConcurrencyAnalysis(OMPCFG cfg) {
-		cfg_ = cfg;
-
-		semanticCheck();
-	}
-
-	/**
-	 * setParent - set the FunctionConcurrencyAnalysis for this cfg
-	 * 
-	 * @param analysis
-	 */
-	public void setParent(FunctionConcurrencyAnalysis analysis) {
-		analysis_ = analysis;
-	}
-
-	/**
-	 * getCFG - accessor the OMPCFG
-	 * 
-	 * @return OMPCFG
-	 */
-	public OMPCFG getCFG() {
-		return cfg_;
-	}
-
-	/**
-	 * getPhases - get all the phases of this component
-	 * 
-	 * @return PhaseConcurrencyAnalysis []
-	 */
-	public PhaseConcurrencyAnalysis[] getPhases() {
-		return phases_;
-	}
-
-	/**
-	 * doPhaseAnalysis - analyse for phases
-	 * 
-	 */
-	public void doPhaseAnalysis() {
-		PhaseAnalysisFactory paf = new PhaseAnalysisFactory(cfg_);
-		paf.buildPhases();
-		phases_ = paf.getPhases();
-
-		cMap_ = new RegionConcurrencyMap(this);
-		cMap_.buildMap();
-	}
-
-	/**
-	 * getNodesConcurrentTo - get all nodes concurrent to given node
-	 * 
-	 * @param node -
-	 *            IASTNode
-	 * @return Set
-	 */
-	public Set getNodesConcurrentTo(IASTNode node) {
-		return cMap_.getNodesConcurrentTo(node);
-	}
-
-	/**
-	 * printPhases - print out all the phases
-	 * 
-	 * @param ps
-	 */
-	public void printComponent(PrintStream ps) {
-		for (int i = 0; i < phases_.length; i++) {
-			ps.println("Component Phase " + i
-					+ " ----------------------------------");
-			phases_[i].printPhase(ps);
-		}
-	}
-
-	/**
-	 * semanticCheck - check for semantic mistakes using pragmas
-	 * 
-	 */
-	private void semanticCheck() {
-		PASTSemanticCheck.checkSemantics(cfg_);
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/RegionConcurrencyMap.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/RegionConcurrencyMap.java
deleted file mode 100644
index fcef0a0..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/RegionConcurrencyMap.java
+++ /dev/null

@@ -1,228 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.ompcfg.factory;
-import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Set;
-
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTOMPPragma;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPBasicBlock;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPCFG;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPCFGNode;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPDFS;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPExpressionBlock;
-import org.eclipse.ptp.pldt.openmp.analysis.ompcfg.OMPPragmaNode;
-
-/**
- * Builds the concurrency map and provides access to it 
- * @author pazel
- *
- */
-public class RegionConcurrencyMap
-{
-
-    protected RegionConcurrencyAnalysis region_ = null;
-    protected OMPCFG                    cfg_       = null;
-    
-    protected PhaseConcurrencyAnalysis []  phases_    = null;
-    
-    // The actual map
-    protected ArrayList               indexMap_ = new ArrayList(); // index->stmt
-    protected Hashtable               stmtMap_  = new Hashtable(); // stmt->index
-    // stmt to BitSet, representing all statments concurrent to stmt
-    protected Hashtable               concurrencyMap_ = new Hashtable();
-    
-    // Used in each phase process to list all nodes found
-    protected LinkedList              phaseStmts_ = new LinkedList();
-    
-    
-    // Some sub-regions need to exclude within themselves.  To help with this,
-    // we build a iastnode-->OMPPragmaNode hashmap, used by the second part of processConcurrency
-    protected Hashtable               exclusionMap_ = new Hashtable();
-    
-    /**
-     * RegionConcurrencyMap - constructor
-     * @param component - RegionConcurrencyAnalysis
-     */
-    public RegionConcurrencyMap(RegionConcurrencyAnalysis region)
-    {
-        region_    = region;
-        cfg_       = region_.getCFG();
-        phases_    = region_.getPhases();
-    }
-    
-    /**
-     * buildMap - build the concurrencyMap_ and other artifacts for the map
-     *
-     */
-    public void buildMap()
-    {
-        for(int i=0; i<phases_.length; i++) 
-            processPhase(phases_[i]);
-    }
-    
-    /**
-     * processPhase - process given phase into the concurrency map
-     * @param phase - PhaseConcurrencyAnalysis
-     */
-    protected void processPhase(PhaseConcurrencyAnalysis phase)
-    {
-        Set nodes = phase.getNodes();  // of OMPCFGNode's
-        phaseStmts_.clear();
-        exclusionMap_.clear();
-        
-        OMPPragmaNode ePragma = null;    // exclusion pragma
-        
-        for(Iterator i=nodes.iterator(); i.hasNext();) {
-            OMPCFGNode node = (OMPCFGNode)i.next();
-            
-            // Establish the exclusion context if any
-            ePragma = node.getPragmaContext();
-            if (ePragma!=null && ePragma.getPragma()!=null) {
-                int pType = ePragma.getPragma().getOMPType();
-                // if none of these situations, all the stmts in the node can execute concurrently to each other
-                // (note: if single and has barrier free path to self, stmts can execute concurrently to each other
-                if (!((pType==PASTOMPPragma.OmpSingle && !hasBarrierFreePathToSelf((OMPBasicBlock)node)) || 
-                      pType==PASTOMPPragma.OmpMaster ||
-                      pType==PASTOMPPragma.OmpOrdered || 
-                      pType==PASTOMPPragma.OmpCritical || 
-                      pType==PASTOMPPragma.OmpSection))
-                    ePragma=null;
-            }
-            else 
-                ePragma=null;
-            
-            if (node instanceof OMPBasicBlock) {
-                LinkedList stmts = ((OMPBasicBlock)node).getFundamentals();
-                for(Iterator j=stmts.iterator(); j.hasNext();) {
-                    IASTNode n = (IASTNode)j.next();
-                    indexNode(n, ePragma);
-                }
-                indexNode(((OMPBasicBlock)node).getBranchingExpression(), ePragma);
-            }
-            else if (node instanceof OMPExpressionBlock) {
-                IASTExpression [] eList = ((OMPExpressionBlock)node).getExpressions();
-                for(int j=0; j<eList.length; j++)
-                    indexNode(eList[j], ePragma);
-            }
-        }
-        
-        // Go though the list of phase nodes, and 
-        //    ASSUMING THEY ARE ALL CONCURRENT WITH EACH OTHER (will change later)
-        // make them all concurrent to each other
-        for(Iterator i=phaseStmts_.iterator(); i.hasNext();) {
-            IASTNode  n = (IASTNode)i.next();
-            OMPPragmaNode ePragmaS = (OMPPragmaNode)exclusionMap_.get(n);
-            int       nIndex = ((Integer)(stmtMap_.get(n))).intValue();
-            for(Iterator j=phaseStmts_.iterator(); j.hasNext();) {
-                IASTNode m = (IASTNode)j.next();
-                OMPPragmaNode ePragmaT = (OMPPragmaNode)exclusionMap_.get(m);
-                
-                // stmts in the same exclusion cannot be concurrent
-                if (!(ePragmaT==ePragmaS && ePragmaT!=null)) {
-                  BitSet   b = (BitSet)(concurrencyMap_.get(m));
-                  b.set(nIndex);
-                }
-                
-            }
-        }
-    }
-    
-    /**
-     * indexNode - index a node if node not seen to this process
-     * @param n - IASTNode
-     */
-    protected void indexNode(IASTNode n, OMPPragmaNode ePragma)
-    {
-        if (n==null)  return;
-        if (!stmtMap_.containsKey(n)) {
-            indexMap_.add(n);
-            stmtMap_.put(n, new Integer(indexMap_.indexOf(n)));
-            concurrencyMap_.put(n, new BitSet());
-        }
-        if (!phaseStmts_.contains(n))
-            phaseStmts_.add(n);
-        // Set up the exclusion map
-        if (ePragma!=null && !exclusionMap_.contains(n))
-            exclusionMap_.put(n, ePragma);
-    }
-    
-    /**
-     * getNodesConcurrentTo - get all nodes concurrent to given node
-     * @param node - IASTNode
-     * @return Set
-     */
-    public Set getNodesConcurrentTo(IASTNode node)
-    {
-        BitSet b = (BitSet)concurrencyMap_.get(node);
-        if (b==null)  return null;    // stmt never registered - ind. called for wrong component
-        
-        HashSet ans = new HashSet();
-        for(int i=b.nextSetBit(0); i>=0; i=b.nextSetBit(i+1)) 
-           ans.add(indexMap_.get(i));
-        return ans;
-    }
-    
-    private boolean hasBarrierFreePathToSelf(OMPBasicBlock singleBlock)
-    {
-        BarrierPathDFS  dfs = new BarrierPathDFS(singleBlock);
-        dfs.startWalking();
-        
-        return dfs.hasBarrierFreePath();
-    }
-    
-    //-------------------------------------------------------------------------
-    //  BarrierPathDFS - find barrier free path to pragma
-    //-------------------------------------------------------------------------
-    private class BarrierPathDFS extends OMPDFS
-    {
-        // find a barrier free path to this node
-        protected OMPPragmaNode target_            = null;
-        protected boolean       barrierFreeExists_ = false;
-        
-        public BarrierPathDFS(OMPBasicBlock block)
-        {
-            super(block);
-            target_ = block.getPragmaContext();
-        }
-        
-        public boolean hasBarrierFreePath()
-        {
-            return barrierFreeExists_;
-        }
-        
-        /**
-         * visit - visit method - what the user usually overrides
-         * @param node - OMPCFGNode
-         */
-        public int visit(OMPCFGNode node)
-        {
-            if (node instanceof OMPPragmaNode) {
-                OMPPragmaNode thisNode = (OMPPragmaNode)node;
-                if (thisNode.isImplicitBarrier() || thisNode.getPragma().getOMPType()==PASTOMPPragma.OmpBarrier)
-                    return SKIP;
-                else if (thisNode==target_) {
-                    barrierFreeExists_=true;
-                    return ABORT;
-                }
-            }
-            return CONTINUE;
-        }
-    }
-    
-    
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/StatementMap.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/StatementMap.java
deleted file mode 100644
index fcaaed3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/ompcfg/factory/StatementMap.java
+++ /dev/null

@@ -1,433 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006,2007 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.analysis.ompcfg.factory;
-import java.util.Hashtable;
-
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.ptp.pldt.common.util.Utility;
-
-/**
- * Interval tree, mapping statement (position, length)->statement
- * @author pazel
- *
- */
-public class StatementMap
-{
-    protected Member     root_             = null;
-    protected Hashtable  iastnodeToMember_ = new Hashtable();
-    
-    public StatementMap()
-    {
-        
-    }
-    
-    public boolean add(IASTNode   node)
-    {
-        if (node==null) return false;
-        
-        Member m = new Member(node);
-        RBInsert(m);
-        
-        iastnodeToMember_.put(node, m);
-
-        return true;
-    }
-    
-    /**
-     * getLocation - get offset/length relative to containing file
-     * @param node - IASTNode
-     * @return Location
-     */
-    public Location getLocation(IASTNode node)
-    {
-        Utility.Location  l = Utility.getLocation(node);  // Use common function
-        return new Location(l.low_, l.high_);
-        /*ASTNode astnode = (node instanceof ASTNode ? (ASTNode)node : null);
-        if (astnode==null)  return null;
-
-        IASTFileLocation ifl         = node.getFileLocation();
-        // offset calculation is tricky - we used the following since it seems to cover the most cases
-        int offset = 0;
-        int length = 0;
-        if (ifl!=null) {
-            offset = ifl.getNodeOffset();   
-            length = ifl.getNodeLength();
-        }
-        else {  // this happens in "omp sections", apparently due to pragmas splitting the region
-            IASTNodeLocation [] locs = node.getNodeLocations(); 
-            if (locs==null || locs.length==0)  return null;
-            offset = locs[0].getNodeOffset();
-            length = astnode.getLength();
-        }
-        return new Location(offset, offset+length-1); */
-    }
-    
-    public void remove(IASTNode   node)
-    {
-        Member m = (Member)iastnodeToMember_.get(node);
-        if (m==null) return;
-        
-        RBDelete(m);
-        
-        iastnodeToMember_.remove(node);
-    }
-
-    public IASTNode find(int offset, int length)
-    {
-        return findInterval(offset, offset+length-1);
-    }
-    
-    public IASTNode findInterval(int offset, int endset)
-    {
-        Member x=findIntervalMember(offset, endset);
-        if (x!=null)
-            return x.node_;
-        return null;
-    }
-    
-    protected Member findIntervalMember(int offset, int endset)
-    {
-        Member x=root_;
-        while(x!=null && !overlap(x.low_, x.high_, offset, endset)) {
-            if (x.left_!=null && x.left_.max_>=offset)
-                x=x.left_;
-            else
-                x=x.right_;
-        }
-        return x;       
-    }
-    
-    protected boolean overlap(int offset1, int endset1, int offset2, int endset2)
-    {
-        if (endset1<offset2 || endset2<offset1) return false;
-        return true;
-    }
-    
-    // NOTE: do not use until we understand
-    //   1) if null should be replaced by a NIL object
-    //   2) where/how to do the max update corrections
-    protected void RBDelete(Member z)
-    {
-        Member y=null, x=null;
-        
-        y=((z.left_==null || z.right_==null) ? z : treeSuccessor(z));
-        x= (y.left_!=null ? y.left_ : y.right_);
-        x.parent_=y.parent_;
-        if (y.parent_==null)
-            root_=x;
-        else {
-            if (y==y.parent_.left_)
-                y.parent_.left_=x;
-            else
-                y.parent_.right_=x;
-        }
-        if (y!=z)
-            z.copyFrom(y);
-        if (y.color_==Member.BLACK)
-            RBDeleteFixup(x);
-    }
-    
-    protected void RBDeleteFixup(Member x)
-    {
-        Member w=null;
-        while(x!=root_ && x.color_==Member.BLACK) {
-            if (x==x.parent_.left_) {
-                w=x.parent_.right_;
-                if (w.color_==Member.RED) {
-                    w.color_=Member.BLACK;
-                    x.parent_.color_=Member.RED;
-                    x.parent_.leftRotate();
-                    w=x.parent_.right_;
-                }
-                if (w.left_.color_==Member.BLACK && w.right_.color_==Member.BLACK){
-                    w.color_=Member.RED;
-                    x=x.parent_;
-                }
-                else { 
-                    if (w.right_.color_==Member.BLACK) {
-                      w.left_.color_=Member.BLACK;
-                      w.color_=Member.RED;
-                      w.rightRotate();
-                      w=x.parent_.right_;
-                    }
-                    w.color_=x.parent_.color_;
-                    x.parent_.color_=Member.BLACK;
-                    w.right_.color_=Member.BLACK;
-                    x.parent_.leftRotate();
-                    x=root_;
-                }
-             }
-            else {
-                // same with left/right exchanged
-                w=x.parent_.left_;
-                if (w.color_==Member.RED) {
-                    w.color_=Member.BLACK;
-                    x.parent_.color_=Member.RED;
-                    x.parent_.rightRotate();
-                    w=x.parent_.left_;
-                }
-                if (w.right_.color_==Member.BLACK && w.left_.color_==Member.BLACK){
-                    w.color_=Member.RED;
-                    x=x.parent_;
-                }
-                else { 
-                    if (w.left_.color_==Member.BLACK) {
-                      w.right_.color_=Member.BLACK;
-                      w.color_=Member.RED;
-                      w.leftRotate();
-                      w=x.parent_.left_;
-                    }
-                    w.color_=x.parent_.color_;
-                    x.parent_.color_=Member.BLACK;
-                    w.left_.color_=Member.BLACK;
-                    x.parent_.rightRotate();
-                    x=root_;
-                }
-            }
-        }
-        x.color_=Member.BLACK;
-    }
-    
-    protected void RBInsert(Member x)
-    {
-        Member y=null;
-        treeInsert(x);
-        x.updateMax();
-        x.color_=Member.RED;
-        while(x!=root_ && x.parent_.color_==Member.RED) {
-            if (x.parent_==x.parent_.parent_.left_) {
-                y=x.parent_.parent_.left_;
-                if (y.color_==Member.RED) {
-                    x.parent_.color_=Member.BLACK;
-                    y.color_=Member.BLACK;
-                    x.parent_.parent_.color_=Member.RED;
-                    x=x.parent_.parent_;
-                }
-                else {
-                    if (x==x.parent_.right_) {
-                        x=x.parent_;
-                        x.leftRotate();
-                    }
-                    x.parent_.color_=Member.BLACK;
-                    x.parent_.parent_.color_=Member.RED;
-                    x.parent_.parent_.rightRotate();
-                }
-            }
-            else {
-                y=x.parent_.parent_.right_;
-                if (y.color_==Member.RED) {
-                    x.parent_.color_=Member.BLACK;
-                    y.color_=Member.BLACK;
-                    x.parent_.parent_.color_=Member.RED;
-                    x=x.parent_.parent_;
-                }
-                else {
-                    if (x==x.parent_.left_) {
-                        x=x.parent_;
-                        x.rightRotate();
-                    }
-                    x.parent_.color_=Member.BLACK;
-                    x.parent_.parent_.color_=Member.RED;
-                    x.parent_.parent_.leftRotate();
-                }
-             }
-        }  // end while
-        root_.color_=Member.BLACK;
-    }
-    
-    protected void treeInsert(Member z)
-    {
-        Member y=null;
-        Member x=root_;
-        
-        while(x!=null) {
-            y=x;
-            x=(z.low_<x.low_ ? x.left_ : x.right_);
-        }
-        z.parent_=y;
-        if (y==null)
-            root_=z;
-        else {
-            if (z.low_<y.low_)
-                y.left_=z;
-            else
-                y.right_=z;
-        }
-    }
-    
-    protected Member treeSuccessor(Member x)
-    {
-        if (x.right_!=null)
-            return treeMinimum(x.right_);
-        Member y=x.parent_;
-        while(y!=null && x==y.right_) {
-            x=y;
-            y=y.parent_;
-        }
-        return y;
-    }
-    
-    protected Member treeMaximum(Member x)
-    {
-        while(x.right_!=null)
-            x=x.right_;
-        return x;
-    }
-    
-    protected Member treeMinimum(Member x)
-    {
-        while(x.left_!=null)
-            x=x.left_;
-        return x;
-    }
-    
-    // for testing
-    protected void add(int offset, int endset)
-    {
-        Member m = new Member(offset, endset);
-        RBInsert(m);
-    }
-    
-    //-------------------------------------------------------------------------
-    // Member
-    //-------------------------------------------------------------------------
-    public class Member
-    {
-        protected int    low_  = 0;
-        protected int    high_ = 0;
-        protected int    max_  = 0;
-        protected int    color_ = 0;
-        protected IASTNode node_ = null;
-        protected Member left_   = null;
-        protected Member right_  = null;
-        protected Member parent_ = null;
-        
-        public static final int RED    = 0;
-        public static final int BLACK  = 1;
-        
-        public Member(int low, int high)
-        {
-            low_  = low;
-            high_ = high;
-        }
-        
-        public Member(Location l, IASTNode node)
-        {
-            low_  = l.low_;
-            high_ = l.high_;
-            node_ = node;
-        }
-        
-        public Member(IASTNode node)
-        {
-            this(getLocation(node), node);
-        }
-        
-        public void copyFrom(Member y)
-        {
-            low_  = y.low_;
-            high_ = y.high_;
-            node_ = y.node_;   // is this right?
-            // TODO: compute max
-        }
-        
-        public void leftRotate()
-        {
-            Member y = this.right_;   //assumed to be non-null;
-            this.right_ = y.left_;
-            if (y.left_!=null)
-                y.left_.parent_ = this;
-            y.parent_ = this.parent_;
-            if (this.parent_==null) 
-                root_=y;
-            else {
-                if (this==this.parent_.left_)
-                    this.parent_.left_=y;
-                else
-                    this.parent_.right_=y;
-            }
-            y.left_=this;
-            this.parent_=y;
-            
-            // Set the max's - order is important
-            this.updateMax();
-            y.updateMax();
-        }
-        
-        public void rightRotate()
-        {
-            Member x = this.left_;   //assumed to be non-null;
-            this.left_ = x.right_;
-            if (x.right_!=null)
-                x.right_.parent_ = this;
-            x.parent_ = this.parent_;
-            if (this.parent_==null) 
-                root_=x;
-            else {
-                if (this==this.parent_.left_)
-                    this.parent_.left_=x;
-                else
-                    this.parent_.right_=x;
-            }
-            x.right_=this;
-            this.parent_=x;
-            
-            // Set the max's - order is important
-            this.updateMax();
-            x.updateMax();
-        }
-        
-        protected void updateMax()
-        {
-            int l = (left_!=null ? left_.max_ : 0);
-            int r = (right_!=null ? right_.max_ : 0);
-            max_ = Math.max(high_, Math.max(l, r));
-        }
-
-    }
-    
-    //-------------------------------------------------------------------------
-    // Member
-    //-------------------------------------------------------------------------
-    protected static class Location
-    {
-        public int low_=0;
-        public int high_=0;
-        
-        public Location(int low, int high)
-        {
-            low_  = low;
-            high_ = high;
-        }
-    }
-    
-    public static void main(String [] args)
-    {
-        StatementMap sm = new StatementMap();
-        
-        sm.add(12, 15);
-        sm.add(1, 6);
-        sm.add(14, 24);
-        
-        Member m = sm.findIntervalMember(12,12);
-        if (m==null)
-            System.out.println("could not find 12");
-        else {
-            System.out.println("found in "+m.low_+":"+m.high_);
-        }
-        
-        
-        return;
-    }
-
-
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/parser/OpenMPKeywords.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/parser/OpenMPKeywords.java
deleted file mode 100644
index 02a14a3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/parser/OpenMPKeywords.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.parser;
-/**
- * OpenMP keywords
- * @author pazel
- *
- */
-public class OpenMPKeywords
-{
-    public static final char[] ATOMIC = "atomic".toCharArray(); //$NON-NLS-1$
-    public static final char[] BARRIER = "barrier".toCharArray(); //$NON-NLS-1$
-    public static final char[] COPYIN = "copyin".toCharArray(); //$NON-NLS-1$
-    public static final char[] COPYPRIVATE = "copyprivate".toCharArray(); //$NON-NLS-1$
-    public static final char[] CRITICAL = "critical".toCharArray(); //$NON-NLS-1$
-    public static final char[] DEFAULT = "default".toCharArray(); //$NON-NLS-1$
-    public static final char[] FIRSTPRIVATE = "firstprivate".toCharArray(); //$NON-NLS-1$
-    public static final char[] FLUSH = "flush".toCharArray(); //$NON-NLS-1$
-    public static final char[] FOR = "for".toCharArray(); //$NON-NLS-1$
-    public static final char[] IF = "if".toCharArray(); //$NON-NLS-1$
-    public static final char[] LASTPRIVATE = "lastprivate".toCharArray(); //$NON-NLS-1$
-    public static final char[] MASTER = "master".toCharArray(); //$NON-NLS-1$
-    public static final char[] NONE       = "none".toCharArray(); //$NON-NLS-1$
-    public static final char[] NOWAIT = "nowait".toCharArray(); //$NON-NLS-1$
-    public static final char[] NUMTHREADS = "num_threads".toCharArray(); //$NON-NLS-1$
-    public static final char[] OMP = "omp".toCharArray(); //$NON-NLS-1$
-    public static final char[] ORDERED = "ordered".toCharArray(); //$NON-NLS-1$
-    public static final char[] PARALLEL = "parallel".toCharArray(); //$NON-NLS-1$
-    public static final char[] PRIVATE = "private".toCharArray(); //$NON-NLS-1$
-    public static final char[] REDUCTION = "reduction".toCharArray(); //$NON-NLS-1$
-    public static final char[] SCHEDULE = "schedule".toCharArray(); //$NON-NLS-1$
-    public static final char[] SECTION = "section".toCharArray(); //$NON-NLS-1$
-    public static final char[] SECTIONS = "sections".toCharArray(); //$NON-NLS-1$
-    public static final char[] SHARED = "shared".toCharArray(); //$NON-NLS-1$
-    public static final char[] SINGLE = "single".toCharArray(); //$NON-NLS-1$
-    public static final char[] THREADPRIVATE = "threadprivate".toCharArray(); //$NON-NLS-1$
-    public static final char[] DYNAMIC = "dynamic".toCharArray();  // $NON-NLS-1$
-    public static final char[] STATIC  = "static".toCharArray();   // $NON-NLS-1$
-    
-    public static final char[] POUND = "#".toCharArray();       // $NON-NLS-1$
-    public static final char[] PRAGMA = "pragma".toCharArray();       // $NON-NLS-1$
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/parser/OpenMPScanner.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/parser/OpenMPScanner.java
deleted file mode 100644
index 716c285..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/parser/OpenMPScanner.java
+++ /dev/null

@@ -1,979 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006,2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.openmp.analysis.parser;
-
-import java.util.Arrays;
-
-import org.eclipse.cdt.core.parser.IGCCToken;
-import org.eclipse.cdt.core.parser.IToken;
-import org.eclipse.cdt.core.parser.util.CharArrayIntMap;
-import org.eclipse.cdt.core.parser.util.CharArrayUtils;
-
-
-/**
- * Class to scan #pragma string for OpenMP syntax (adapted from cdt's BaseScanner)
- * 
- * @author Pazel
- * 
- */
-
-public class OpenMPScanner
-{
-    //  Char buffer
-    private char [] inputBuffer_ = null;
-    //  Current position into buffer
-    private int    currentPos_   = -1;
-    private int    endPos_       = 0;   // index just past last char
-    
-    // These need to be set
-    protected final boolean supportMinAndMax = true;
-    protected final boolean support$Initializers = true;
-    
-    protected static char[] EMPTY_CHAR_ARRAY = new char[0];
-    
-    //protected ScannerCallbackManager callbackManager_ = null;  // unused; removed for CDT5.0
-    
-    //**
-    //  OpenMPScanner - Object to scan OpenMP pragma line
-    //**
-    public OpenMPScanner(String inputBuffer)
-    {
-       inputBuffer_ = inputBuffer.toCharArray(); 
-       endPos_      = inputBuffer.length();
-    }
-    
-    public OpenMPToken nextToken() 
-    {
-        
-      return fetchToken();
-    }
-    
-    protected OpenMPToken fetchToken()
-    {
-        
-        while (currentPos_<endPos_)  {
-
-          skipOverWhiteSpace();
-          
-          currentPos_++;
-          
-          if (currentPos_>=endPos_)
-              return null;
-   
-          switch (inputBuffer_[currentPos_]) {
-          case '\r':
-          case '\n':
-              continue;
-
-          case 'L':
-              if (currentPos_ + 1 < endPos_ && inputBuffer_[currentPos_ + 1] == '"')
-                  return scanString();
-              if (currentPos_ + 1 < endPos_ && inputBuffer_[currentPos_ + 1] == '\'')
-                  return scanCharLiteral();
-
-              return scanIdentifier();
-
-          case '"':
-              return scanString();
-
-        case '\'':
-            return scanCharLiteral();
-
-        case 'a':
-        case 'b':
-        case 'c':
-        case 'd':
-        case 'e':
-        case 'f':
-        case 'g':
-        case 'h':
-        case 'i':
-        case 'j':
-        case 'k':
-        case 'l':
-        case 'm':
-        case 'n':
-        case 'o':
-        case 'p':
-        case 'q':
-        case 'r':
-        case 's':
-        case 't':
-        case 'u':
-        case 'v':
-        case 'w':
-        case 'x':
-        case 'y':
-        case 'z':
-        case 'A':
-        case 'B':
-        case 'C':
-        case 'D':
-        case 'E':
-        case 'F':
-        case 'G':
-        case 'H':
-        case 'I':
-        case 'J':
-        case 'K':
-        case 'M':
-        case 'N':
-        case 'O':
-        case 'P':
-        case 'Q':
-        case 'R':
-        case 'S':
-        case 'T':
-        case 'U':
-        case 'V':
-        case 'W':
-        case 'X':
-        case 'Y':
-        case 'Z':
-        case '_':
-            return  scanIdentifier();
-
-        case '\\':
-            if (currentPos_ + 1 < endPos_
-                    && (inputBuffer_[currentPos_ + 1] == 'u' || 
-                        inputBuffer_[currentPos_ + 1] == 'U')) {
-                return scanIdentifier();
-            }
-            //handleProblem(IProblem.SCANNER_BAD_CHARACTER,
-            //        bufferPos[bufferStackPos], new char[] { '\\' });
-            continue;
-
-        case '0':
-        case '1':
-        case '2':
-        case '3':
-        case '4':
-        case '5':
-        case '6':
-        case '7':
-        case '8':
-        case '9':
-            return scanNumber();
-
-        case '.':
-            if (currentPos_ + 1 < endPos_) {
-                switch (inputBuffer_[currentPos_ + 1]) {
-                case '0':
-                case '1':
-                case '2':
-                case '3':
-                case '4':
-                case '5':
-                case '6':
-                case '7':
-                case '8':
-                case '9':
-                    return scanNumber();
-
-                case '.':
-                    if (currentPos_ + 2 < endPos_) {
-                        if (inputBuffer_[currentPos_ + 2] == '.') {
-                            currentPos_ += 2;
-                            return newToken(IToken.tELLIPSIS);
-                        }
-                    }
-                case '*':
-                    ++currentPos_;
-                    return newToken(IToken.tDOTSTAR);
-                }
-            }
-            return newToken(IToken.tDOT);
-
-        case '#':
-            if (currentPos_ + 1 < endPos_ && inputBuffer_[currentPos_ + 1] == '#') {
-                currentPos_++;
-                return newToken(IToken.tPOUNDPOUND);
-            }
-            return newToken(mpPound);
-
-        case '{':
-            currentPos_++;
-            return newToken(IToken.tLBRACE);
-
-        case '}':
-            currentPos_++;
-            return newToken(IToken.tRBRACE);
-
-        case '[':
-            currentPos_++;
-            return newToken(IToken.tLBRACKET);
-
-        case ']':
-            currentPos_++;
-            return newToken(IToken.tRBRACKET);
-
-        case '(':
-            return newToken(IToken.tLPAREN);
-
-        case ')':
-            return newToken(IToken.tRPAREN);
-
-        case ';':
-            return newToken(IToken.tSEMI);
-
-        case ':':
-            if (currentPos_ + 1 < endPos_) {
-                if (inputBuffer_[currentPos_ + 1] == ':') {
-                    ++currentPos_;
-                    return newToken(IToken.tCOLONCOLON);
-                }
-            }
-            return newToken(IToken.tCOLON);
-
-        case '?':
-            return newToken(IToken.tQUESTION);
-
-        case '+':
-            if (currentPos_ + 1 < endPos_) {
-                if (inputBuffer_[currentPos_ + 1] == '+') {
-                    ++currentPos_;
-                    return newToken(IToken.tINCR);
-                } else if (inputBuffer_[currentPos_ + 1] == '=') {
-                    ++currentPos_;
-                    return newToken(IToken.tPLUSASSIGN);
-                }
-            }
-            return newToken(IToken.tPLUS);
-
-        case '-':
-            if (currentPos_ + 1 < endPos_) {
-                if (inputBuffer_[currentPos_ + 1] == '>') {
-                    if (currentPos_ + 2 < endPos_) {
-                        if (inputBuffer_[currentPos_ + 2] == '*') {
-                            currentPos_ += 2;
-                            return newToken(IToken.tARROWSTAR);
-                        }
-                    }
-                    ++currentPos_;
-                    return newToken(IToken.tARROW);
-                } else if (inputBuffer_[currentPos_ + 1] == '-') {
-                    ++currentPos_;
-                    return newToken(IToken.tDECR);
-                } else if (inputBuffer_[currentPos_ + 1] == '=') {
-                    ++currentPos_;
-                    return newToken(IToken.tMINUSASSIGN);
-                }
-            }
-            return newToken(IToken.tMINUS);
-
-        case '*':
-            if (currentPos_ + 1 < endPos_) {
-                if (inputBuffer_[currentPos_ + 1] == '=') {
-                    ++currentPos_;
-                    return newToken(IToken.tSTARASSIGN);
-                }
-            }
-            return newToken(IToken.tSTAR);
-
-        case '/':
-            if (currentPos_ + 1 < endPos_) {
-                if (inputBuffer_[currentPos_ + 1] == '=') {
-                    ++currentPos_;
-                    return newToken(IToken.tDIVASSIGN);
-                }
-            }
-            return newToken(IToken.tDIV);
-
-        case '%':
-            if (currentPos_ + 1 < endPos_) {
-                if (inputBuffer_[currentPos_ + 1] == '=') {
-                    ++currentPos_;
-                    return newToken(IToken.tMODASSIGN);
-                }
-            }
-            return newToken(IToken.tMOD);
-
-        case '^':
-            if (currentPos_ + 1 < endPos_) {
-                if (inputBuffer_[currentPos_ + 1] == '=') {
-                    ++currentPos_;
-                    return newToken(IToken.tXORASSIGN);
-                }
-            }
-            return newToken(IToken.tXOR);
-
-        case '&':
-            if (currentPos_ + 1 < endPos_) {
-                if (inputBuffer_[currentPos_ + 1] == '&') {
-                    ++currentPos_;
-                    return newToken(IToken.tAND);
-                } else if (inputBuffer_[currentPos_ + 1] == '=') {
-                    ++currentPos_;
-                    return newToken(IToken.tAMPERASSIGN);
-                }
-            }
-            return newToken(IToken.tAMPER);
-
-        case '|':
-            if (currentPos_ + 1 < endPos_) {
-                if (inputBuffer_[currentPos_ + 1] == '|') {
-                    ++currentPos_;
-                    return newToken(IToken.tOR);
-                } else if (inputBuffer_[currentPos_ + 1] == '=') {
-                    ++currentPos_;
-                    return newToken(IToken.tBITORASSIGN);
-                }
-            }
-            return newToken(IToken.tBITOR);
-
-        case '~':
-            return newToken(IToken.tCOMPL);
-
-        case '!':
-            if (currentPos_ + 1 < endPos_) {
-                if (inputBuffer_[currentPos_ + 1] == '=') {
-                    ++currentPos_;
-                    return newToken(IToken.tNOTEQUAL);
-                }
-            }
-            return newToken(IToken.tNOT);
-
-        case '=':
-            if (currentPos_ + 1 < endPos_) {
-                if (inputBuffer_[currentPos_ + 1] == '=') {
-                    ++currentPos_;
-                    return newToken(IToken.tEQUAL);
-                }
-            }
-            return newToken(IToken.tASSIGN);
-
-        case '<':
-            if (currentPos_ + 1 < endPos_) {
-                if (inputBuffer_[currentPos_ + 1] == '=') {
-                    ++currentPos_;
-                    return newToken(IToken.tLTEQUAL);
-                } else if (inputBuffer_[currentPos_ + 1] == '<') {
-                    if (currentPos_ + 2 < endPos_) {
-                        if (inputBuffer_[currentPos_ + 2] == '=') {
-                            currentPos_ += 2;
-                            return newToken(IToken.tSHIFTLASSIGN);
-                        }
-                    }
-                    ++currentPos_;
-                    return newToken(IToken.tSHIFTL);
-                } else if (inputBuffer_[currentPos_ + 1] == '?' && supportMinAndMax) {
-                    ++currentPos_;
-                    return newToken(CharArrayUtils.extract(
-                            inputBuffer_, currentPos_, 2), IGCCToken.tMIN);
-                }
-            }
-            return newToken(IToken.tLT);
-
-        case '>':
-            if (currentPos_ + 1 < endPos_) {
-                if (inputBuffer_[currentPos_ + 1] == '=') {
-                    ++currentPos_;
-                    return newToken(IToken.tGTEQUAL);
-                } else if (inputBuffer_[currentPos_ + 1] == '>') {
-                    if (currentPos_ + 2 < endPos_) {
-                        if (inputBuffer_[currentPos_ + 2] == '=') {
-                            currentPos_ += 2;
-                            return newToken(IToken.tSHIFTRASSIGN);
-                        }
-                    }
-                    ++currentPos_;
-                    return newToken(IToken.tSHIFTR);
-                } else if (inputBuffer_[currentPos_ + 1] == '?' && supportMinAndMax) {
-                    ++currentPos_;
-                    return newToken(CharArrayUtils.extract(
-                            inputBuffer_, currentPos_, 2), IGCCToken.tMAX);
-                }
-
-            }
-            return newToken(IToken.tGT);
-
-        case ',':
-            return newToken(IToken.tCOMMA);
-
-        default:
-            if (Character.isLetter(inputBuffer_[currentPos_]) || inputBuffer_[currentPos_] == '_'
-                    || (support$Initializers && inputBuffer_[currentPos_] == '$')) {
-                return scanIdentifier();
-            }
-
-        // skip over anything we don't handle
-            //char [] x = new char [1];
-            //x[0] = buffer[pos];
-            //handleProblem( IASTProblem.SCANNER_BAD_CHARACTER, pos, x );
-        }
-        }
-
-    // We've run out of contexts, our work is done here
-    //return contentAssistMode ? eocToken : null;
-        return null;
-    }
-
-
-  protected OpenMPToken scanString() 
-  {
-    char[] buffer = inputBuffer_;
-
-    int tokenType = IToken.tSTRING;
-    if (buffer[currentPos_] == 'L') {
-        ++currentPos_;
-        tokenType = IToken.tLSTRING;
-    }
-
-    int stringStart = currentPos_ + 1;
-    int stringLen = 0;
-    boolean escaped = false;
-    boolean foundClosingQuote = false;
-    loop: while (++currentPos_ < endPos_) {
-        ++stringLen;
-        char c = buffer[currentPos_];
-        if (c == '"') {
-            if (!escaped) {
-                foundClosingQuote = true;
-                break;
-            }
-        } else if (c == '\\') {
-            escaped = !escaped;
-            continue;
-        } else if (c == '\n') {
-            //unescaped end of line before end of string
-            if (!escaped)
-                break;
-        } else if (c == '\r') {
-            if (currentPos_ + 1 < endPos_
-                    && buffer[currentPos_ + 1] == '\n') {
-                ++currentPos_;
-                if (!escaped)
-                    break;
-            }
-        }
-        escaped = false;
-    }
-    --stringLen;
-
-    // We should really throw an exception if we didn't get the terminating
-    // quote before the end of buffer
-    char[] result = CharArrayUtils.extract(buffer, stringStart, stringLen);
-    //if (!foundClosingQuote) {
-    //    handleProblem(IProblem.SCANNER_UNBOUNDED_STRING, stringStart,
-    //            result);
-    //}
-    return newToken(result, tokenType);
-  }
-
-  protected OpenMPToken scanCharLiteral() 
-  {
-    char[] buffer = inputBuffer_;
-    int start = currentPos_;
-    int limit = endPos_;
-
-    int tokenType = IToken.tCHAR;
-    int length = 1;
-    if (inputBuffer_[currentPos_] == 'L') {
-        ++currentPos_;
-        tokenType = IToken.tLCHAR;
-        ++length;
-    }
-
-    if (start >= limit) {
-        return newToken(EMPTY_CHAR_ARRAY, tokenType);
-    }
-
-    boolean escaped = false;
-    while (++currentPos_ < endPos_) {
-        ++length;
-        int pos = currentPos_;
-        if (buffer[pos] == '\'') {
-            if (!escaped)
-                break;
-        } else if (buffer[pos] == '\\') {
-            escaped = !escaped;
-            continue;
-        }
-        escaped = false;
-    }
-
-    if (currentPos_ == endPos_) {
-        //handleProblem(IProblem.SCANNER_BAD_CHARACTER, start, CharArrayUtils
-        //        .extract(buffer, start, length));
-        return newToken(EMPTY_CHAR_ARRAY, tokenType);
-    }
-
-    char[] image = length > 0 ? CharArrayUtils.extract(buffer, start,
-            length) : EMPTY_CHAR_ARRAY;
-
-    return newToken(image, tokenType);
-}
-
-  protected OpenMPToken scanNumber()
-  {
-      char[] buffer = inputBuffer_;
-      int start = currentPos_;
-      int limit = endPos_;
-
-      boolean isFloat = buffer[start] == '.';
-      boolean hasExponent = false;
-
-      boolean isHex = false;
-      boolean isOctal = false;
-      boolean isMalformedOctal = false;
-
-      if (buffer[start] == '0' && start + 1 < limit) {
-          switch (buffer[start + 1]) {
-          case 'x':
-          case 'X':
-              isHex = true;
-              ++currentPos_;
-              break;
-          default:
-              if (buffer[start + 1] > '0' && buffer[start + 1] < '7')
-                  isOctal = true;
-              else if (buffer[start + 1] == '8' || buffer[start + 1] == '9') {
-                  isOctal = true;
-                  isMalformedOctal = true;
-              }
-          }
-      }
-
-      while (++currentPos_ < limit) {
-          int pos = currentPos_;
-          switch (buffer[pos]) {
-          case '0':
-          case '1':
-          case '2':
-          case '3':
-          case '4':
-          case '5':
-          case '6':
-          case '7':
-          case '8':
-          case '9':
-              if ((buffer[pos] == '8' || buffer[pos] == '9') && isOctal) {
-                  isMalformedOctal = true;
-                  break;
-              }
-
-              continue;
-
-          case '.':
-              //if (isLimitReached())
-              //    handleNoSuchCompletion();
-
-              if (isFloat) {
-                  // second dot
-                  //handleProblem(IProblem.SCANNER_BAD_FLOATING_POINT, start,
-                  //        null);
-                  break;
-              }
-
-              isFloat = true;
-              continue;
-
-          case 'E':
-          case 'e':
-              if (isHex)
-                  // a hex 'e'
-                  continue;
-
-              if (hasExponent)
-                  // second e
-                  break;
-
-              if (pos + 1 >= limit)
-                  // ending on the e?
-                  break;
-
-              switch (buffer[pos + 1]) {
-              case '+':
-              case '-':
-              case '0':
-              case '1':
-              case '2':
-              case '3':
-              case '4':
-              case '5':
-              case '6':
-              case '7':
-              case '8':
-              case '9':
-                  // looks like a good exponent
-                  isFloat = true;
-                  hasExponent = true;
-                  ++currentPos_;
-                  continue;
-              default:
-                  // no exponent number?
-                  break;
-              }
-              break;
-
-          case 'a':
-          case 'A':
-          case 'b':
-          case 'B':
-          case 'c':
-          case 'C':
-          case 'd':
-          case 'D':
-              if (isHex)
-                  continue;
-
-              // not ours
-              break;
-
-          case 'f':
-          case 'F':
-              if (isHex)
-                  continue;
-
-              // must be float suffix
-              ++currentPos_;
-
-              if (currentPos_ < buffer.length
-                      && buffer[currentPos_] == 'i')
-                  continue; // handle GCC extension 5.10 Complex Numbers
-
-              break; // fix for 77281 (used to be continue)
-
-          case 'p':
-          case 'P':
-              // Hex float exponent prefix
-              if (!isFloat || !isHex) {
-                  --currentPos_;
-                  break;
-              }
-
-              if (hasExponent)
-                  // second p
-                  break;
-
-              if (pos + 1 >= limit)
-                  // ending on the p?
-                  break;
-
-              switch (buffer[pos + 1]) {
-              case '+':
-              case '-':
-              case '0':
-              case '1':
-              case '2':
-              case '3':
-              case '4':
-              case '5':
-              case '6':
-              case '7':
-              case '8':
-              case '9':
-                  // looks like a good exponent
-                  isFloat = true;
-                  hasExponent = true;
-                  ++currentPos_;
-                  continue;
-              default:
-                  // no exponent number?
-                  break;
-              }
-              break;
-
-          case 'u':
-          case 'U':
-          case 'L':
-          case 'l':
-              // unsigned suffix
-              suffixLoop: while (++currentPos_ < limit) {
-                  switch (buffer[currentPos_]) {
-                  case 'U':
-                  case 'u':
-                  case 'l':
-                  case 'L':
-                      break;
-                  default:
-
-                      break suffixLoop;
-                  }
-              }
-              break;
-
-          default:
-              /*boolean success = false;
-              for (int iter = 0; iter < suffixes.length; iter++)
-                  if (buffer[pos] == suffixes[iter]) {
-                      success = true;
-                      break;
-                  }
-              if (success)
-                  continue; */
-          }
-
-          // If we didn't continue in the switch, we're done
-          break;
-      }
-
-      --currentPos_;
-
-      char[] result = CharArrayUtils.extract(buffer, start,
-              currentPos_ - start + 1);
-      int tokenType = isFloat ? IToken.tFLOATINGPT : IToken.tINTEGER;
-
-      //if (tokenType == IToken.tINTEGER && isHex && result.length == 2) {
-      //    handleProblem(IProblem.SCANNER_BAD_HEX_FORMAT, start, result);
-      //} else if (tokenType == IToken.tINTEGER && isOctal && isMalformedOctal) {
-      //    handleProblem(IProblem.SCANNER_BAD_OCTAL_FORMAT, start, result);
-      //}
-
-      return newToken(result, tokenType);
-  }
-
-
-    //**
-    //  skipOverWhiteSpace - based on org.eclipse.cdt.internal.parser.scanner2.BaseScanner
-    //**
-    protected void skipOverWhiteSpace() {
-
-        char[] buffer = inputBuffer_;
-
-         while (++currentPos_ < endPos_) {
-            switch (buffer[currentPos_]) {
-            case ' ':
-            case '\t':
-            case '\r':
-                continue;
-            case '/':
-                if (currentPos_ + 1 < endPos_) {
-                    if (buffer[currentPos_ + 1] == '/') {
-                        // C++ comment, skip rest of line
-                        currentPos_ = endPos_;
-                        return;
-                    } else if (buffer[currentPos_ + 1] == '*') {
-                        // C comment, find closing */
-                        boolean foundEnd = false;
-                        for (currentPos_ += 2; currentPos_ < endPos_; ++currentPos_) {
-                            if (buffer[currentPos_] == '*' && currentPos_ + 1 < endPos_
-                                    && buffer[currentPos_ + 1] == '/') {
-                                currentPos_+=2;
-                                foundEnd = true;
-                                break;
-                            }
-                        }
-                        if (!foundEnd)  // we are at end of line  - nothing to do (odd case)
-                            return;
-                        continue;
-                    }
-                }
-                break;
-            case '\\':
-                if (currentPos_ + 1 < endPos_ && buffer[currentPos_ + 1] == '\n') {
-                    // \n is a whitespace
-                    ++currentPos_;
-                    continue;
-                }
-                if (currentPos_ + 1 < endPos_ && buffer[currentPos_ + 1] == '\r') {
-                    if (currentPos_ + 2 < endPos_ && buffer[currentPos_ + 2] == '\n') {
-                        currentPos_ += 2;
-                        continue;
-                    }
-                }
-                break;
-            }
-
-            // fell out of switch without continuing, we're done
-            --currentPos_;
-            return;
-        }
-        
-        
-        --currentPos_;
-        return;
-    }
-    
-    protected OpenMPToken scanIdentifier() 
-    {
-        char[] buffer = inputBuffer_;
-        boolean escapedNewline = false;
-        int     start          = currentPos_;
-        int len = 1;
-
-        while (++currentPos_ < endPos_) {
-            char c = buffer[currentPos_];
-            if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '_'
-                    || (c >= '0' && c <= '9')
-                    || Character.isUnicodeIdentifierPart(c)) {
-                ++len;
-                continue;
-            } else if (c == '\\' && currentPos_ + 1 < endPos_
-                    && buffer[currentPos_ + 1] == '\n') {
-                // escaped newline
-                ++endPos_;
-                len += 2;
-                escapedNewline = true;
-                continue;
-            } else if (c == '\\' && (currentPos_ + 1 < endPos_)) {
-                if ((buffer[currentPos_ + 1] == 'u')
-                        || buffer[currentPos_ + 1] == 'U') {
-                    ++currentPos_;
-                    len += 2;
-                    continue;
-                }
-            }
-            //} else if ((support$Initializers && c == '$')) {
-            //    ++len;
-            //    continue;
-            //}
-            break;
-        }
-
-        --currentPos_;
-
-        char[] result = escapedNewline ? removedEscapedNewline(buffer, start,
-                len) : CharArrayUtils.extract(buffer, start, len);
-        int tokenType = escapedNewline ? mpKeywords.get(result, 0, result.length)
-                : mpKeywords.get(buffer, start, len);
-
-        /*if (tokenType == CharArrayIntMap.undefined) {
-            tokenType = escapedNewline ? additionalKeywords.get(result, 0,
-                    result.length) : additionalKeywords.get(buffer, start, len);
-
-            if (tokenType == additionalKeywords.undefined) {
-                result = (result != null) ? result : CharArrayUtils.extract(
-                        buffer, start, len);
-                return newToken(IToken.tIDENTIFIER, result);
-            }
-            result = (result != null) ? result : CharArrayUtils.extract(buffer,
-                    start, len);
-            return newToken(result, tokenType);
-        }*/
-        return newToken(result, tokenType);
-    }
-
-    /**
-     * @return
-     */
-    protected OpenMPToken newToken(int signal) {
-        return new OpenMPToken(signal, currentPos_);
-    }
-    
-
-    /**
-     * @return
-     */
-    protected OpenMPToken newToken(char [] image, int signal) {
-        return new OpenMPToken(new String(image), currentPos_, signal);
-    }
-
-
-    /**
-     * @param text
-     * @return
-     */
-    protected char[] removedEscapedNewline(char[] text, int start, int len) {
-        if (CharArrayUtils.indexOf('\n', text, start, len) == -1)
-            return text;
-        char[] result = new char[text.length];
-        Arrays.fill(result, ' ');
-        int counter = 0;
-        for (int i = 0; i < text.length; ++i) {
-            if (text[i] == '\\' && i + 1 < text.length && text[i + 1] == '\n')
-                ++i;
-            else if (text[i] == '\\' && i + 1 < text.length
-                    && text[i + 1] == '\r' && i + 2 < text.length
-                    && text[i + 2] == '\n')
-                i += 2;
-            else
-                result[counter++] = text[i];
-        }
-        return CharArrayUtils.trim(result);
-    }
-    
-    /**
-     * handleProblem - will create problems to report through eclipse
-     * @param id
-     * @param startOffset
-     */
-    private void handleProblem(int id, int startOffset) 
-    {
-       // TBD
-    }
-
-
-    public static final int mpAtomic  = 0;
-    public static final int mpBarrier = 1;
-    public static final int mpCopyin  = 2;
-    public static final int mpCopyprivate  = 3;
-    public static final int mpCritical     = 4;
-    public static final int mpDefault      = 5;
-    public static final int mpFirstprivate = 6;
-    public static final int mpFlush  = 7;
-    public static final int mpFor    = 8;
-    public static final int mpIf     = 9;
-    public static final int mpLastprivate  = 10;
-    public static final int mpMaster       = 11;
-    public static final int mpNone         = 12;
-    public static final int mpNowait       = 13;
-    public static final int mpNumthreads   = 14;
-    public static final int mpOmp      = 15;
-    public static final int mpOrdered  = 16;
-    public static final int mpParallel = 17;
-    public static final int mpPrivate  = 18;
-    public static final int mpReduction  = 19;
-    public static final int mpSchedule   = 20;
-    public static final int mpSection    = 21;
-    public static final int mpSections   = 22;
-    public static final int mpShared  = 23;
-    public static final int mpSingle  = 24;
-    public static final int mpThreadPrivate = 25;
-    public static final int mpPound   = 26;
-    public static final int mpPragma  = 27;
-    public static final int mpDynamic = 28;
-    public static final int mpGuided  = 29;
-    public static final int mpRuntime = 30;
-    public static final int mpStatic  = 31;
-    
-    public static final CharArrayIntMap mpKeywords;
-    
-    static {
-        mpKeywords = new CharArrayIntMap(16, -1);
-
-        // Common keywords
-        mpKeywords.put(OpenMPKeywords.ATOMIC,  mpAtomic); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.BARRIER, mpBarrier); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.COPYIN,  mpCopyin); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.COPYPRIVATE,  mpCopyprivate); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.CRITICAL,  mpCritical); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.DEFAULT,  mpDefault); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.FIRSTPRIVATE,  mpFirstprivate); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.FLUSH,  mpFlush); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.FOR,  mpFor); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.IF,  mpIf); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.LASTPRIVATE,  mpLastprivate); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.MASTER,  mpMaster); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.NONE,  mpNone); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.NOWAIT,  mpNowait); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.NUMTHREADS,  mpNumthreads); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.OMP,  mpOmp); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.ORDERED,  mpOrdered); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.PARALLEL,  mpParallel); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.PRIVATE,  mpPrivate); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.REDUCTION,  mpReduction); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.SCHEDULE,  mpSchedule); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.SECTION,  mpSection); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.SECTIONS,  mpSections); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.SHARED,  mpShared); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.SINGLE,  mpSingle); //$NON-NLS-1$
-        mpKeywords.put(OpenMPKeywords.POUND, mpPound);
-        mpKeywords.put(OpenMPKeywords.PRAGMA, mpPragma);
-        mpKeywords.put(OpenMPKeywords.THREADPRIVATE, mpThreadPrivate);
-        mpKeywords.put(OpenMPKeywords.DYNAMIC, mpDynamic);
-        mpKeywords.put(OpenMPKeywords.STATIC,  mpStatic);   // not sure of this - DPP
-    }
-
-
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/parser/OpenMPToken.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/parser/OpenMPToken.java
deleted file mode 100644
index 4577c91..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/parser/OpenMPToken.java
+++ /dev/null

@@ -1,202 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.parser;
-
-
-/**
- * Token used in parsing OpenMP pragma line
- * 
- * @author pazel
- */
-public class OpenMPToken
-{
-    private int    type_  = tUNDEFINED;
-    private String image_ = "";
-    private int    onset_ = -1;
-    
-    // for backtracking
-    private OpenMPToken next_ = null;
-    
-    /**
-     * OpenMPToken - constructor
-     * @param image: String
-     * @param onset: int
-     * @param type:  int
-     */
-    public OpenMPToken(String image, int onset, int type)
-    {
-        image_ = image;
-        onset_ = onset;
-        type_  = type;
-    }
-    
-    /**
-     * OpenMPToken - constructor
-     * @param type:  int
-     * @param onset: int
-     */
-    public OpenMPToken(int type, int onset)
-    {
-        type_  = type;
-        onset_ = onset;
-    }
-
-    public int getType()
-    {
-        return type_;
-    }
-    
-    public String getImage()
-    {
-        return image_;
-    }
-    
-    public int getOnset()
-    {
-        return onset_;
-    }
-    
-    public int getLength()
-    {
-        return image_.length();
-    }
-    
-    public int getEndOnset()
-    {
-        return onset_+getLength()-1;
-    }
-    
-    public void setNext(OpenMPToken next)
-    {
-        next_ = next;
-    }
-    
-    public OpenMPToken getNext()
-    {
-        return next_;
-    }
-    
-    
-    
-    // Token types
-    static public final int tUNDEFINED  = -1;
-    
-    static public final int tIDENTIFIER = 1;
-
-    static public final int tINTEGER = 2;
-
-    static public final int tCOLONCOLON = 3;
-
-    static public final int tCOLON = 4;
-
-    static public final int tSEMI = 5;
-
-    static public final int tCOMMA = 6;
-
-    static public final int tQUESTION = 7;
-
-    static public final int tLPAREN = 8;
-
-    static public final int tRPAREN = 9;
-
-    static public final int tLBRACKET = 10;
-
-    static public final int tRBRACKET = 11;
-
-    static public final int tLBRACE = 12;
-
-    static public final int tRBRACE = 13;
-
-    static public final int tPLUSASSIGN = 14;
-
-    static public final int tINCR = 15;
-
-    static public final int tPLUS = 16;
-
-    static public final int tMINUSASSIGN = 17;
-
-    static public final int tDECR = 18;
-
-    static public final int tARROWSTAR = 19;
-
-    static public final int tARROW = 20;
-
-    static public final int tMINUS = 21;
-
-    static public final int tSTARASSIGN = 22;
-
-    static public final int tSTAR = 23;
-
-    static public final int tMODASSIGN = 24;
-
-    static public final int tMOD = 25;
-
-    static public final int tXORASSIGN = 26;
-
-    static public final int tXOR = 27;
-
-    static public final int tAMPERASSIGN = 28;
-
-    static public final int tAND = 29;
-
-    static public final int tAMPER = 30;
-
-    static public final int tBITORASSIGN = 31;
-
-    static public final int tOR = 32;
-
-    static public final int tBITOR = 33;
-
-    static public final int tCOMPL = 34;
-
-    static public final int tNOTEQUAL = 35;
-
-    static public final int tNOT = 36;
-
-    static public final int tEQUAL = 37;
-
-    static public final int tASSIGN = 38;
-
-    static public final int tSHIFTL = 40;
-
-    static public final int tLTEQUAL = 41;
-
-    static public final int tLT = 42;
-
-    static public final int tSHIFTRASSIGN = 43;
-
-    static public final int tSHIFTR = 44;
-
-    static public final int tGTEQUAL = 45;
-
-    static public final int tGT = 46;
-
-    static public final int tSHIFTLASSIGN = 47;
-
-    static public final int tELLIPSIS = 48;
-
-    static public final int tDOTSTAR = 49;
-
-    static public final int tDOT = 50;
-
-    static public final int tDIVASSIGN = 51;
-
-    static public final int tDIV = 52;
-
-    static public final int t_and = 54;
-
-    static public final int t_and_eq = 55;
-
-    static public final int t_asm = 56;
-
-
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/textview/ShowConcurrencyAction.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/textview/ShowConcurrencyAction.java
deleted file mode 100644
index 5e858ee..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis/src/org/eclipse/ptp/pldt/openmp/analysis/textview/ShowConcurrencyAction.java
+++ /dev/null

@@ -1,203 +0,0 @@
-/**********************************************************************
- * 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
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.analysis.textview;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Set;
-
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.internal.ui.editor.CEditor;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.ptp.pldt.common.util.Utility;
-import org.eclipse.ptp.pldt.openmp.analysis.OpenMPAnalysisManager;
-import org.eclipse.ptp.pldt.openmp.analysis.internal.core.OpenMpIDs;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.actions.ActionDelegate;
-
-/**
- * Action to Select a line and show the concurrency
- * @author pazel
- *
- */
-public class ShowConcurrencyAction extends ActionDelegate 
-                                   implements IEditorActionDelegate
-{
-    protected CEditor  editor_ = null;
-    
-    protected static final String TITLE = "Show Concurrency";
-    
-    /**
-     * Sets the active editor for the delegate.  
-     * Implementors should disconnect from the old editor, connect to the 
-     * new editor, and update the action to reflect the new editor.
-     *
-     * @param action the action proxy that handles presentation portion of the action
-     * @param targetEditor the new editor target
-     */
-    public void setActiveEditor(IAction action, IEditorPart targetEditor)
-    {
-        if (targetEditor instanceof CEditor)
-            editor_ = (CEditor)targetEditor;
-    }
-    
-
-    /**
-     * The <code>ActionDelegate</code> implementation of this
-     * <code>IActionDelegate2</code> method redirects to the <code>run</code>
-     * method. Subclasses may reimplement.
-     */
-    public void runWithEvent(IAction action, Event event) {
-        TextSelection selection = null;
-        if (editor_!=null && 
-            editor_.getSelectionProvider().getSelection() instanceof TextSelection) {
-            selection = (TextSelection)editor_.getSelectionProvider().getSelection();
-        }
-        if (selection!=null) {
-            showConcurrency(selection);
-        }
-        else 
-            showMessage(TITLE, "No selections made");
-    }
-    
-    protected void showMessage(String title, String message)
-    {
-        MessageDialog.openInformation(getStandardDisplay().getActiveShell(), title, message);
-    }
-    
-    public static Display getStandardDisplay() {
-        Display display= Display.getCurrent();
-        if (display == null) {
-            display= Display.getDefault();
-        }
-        return display;     
-    }
-    
-    /**
-     * showConcurrency - triggered by the context menu action
-     * @param selection - TextSelection
-     */
-    protected void showConcurrency(TextSelection selection)
-    {
-        if (selection.getOffset()==0 && selection.getLength()==0) {
-            showMessage(TITLE, "No selections made");
-            return;
-        }
-
-        // Get the last analysis
-        OpenMPAnalysisManager oam = OpenMPAnalysisManager.getCurrentManager();
-        if (oam==null) {
-            showMessage(TITLE, "No OpenMP Analysis has been performed");
-            return;
-        }
-        
-        // Now we check if the analysis is for this file
-        if (oam.getTU()==null ) {
-            showMessage(TITLE, "Error in last OpenMP Analysis");
-            return;
-        }
-        //String f1 = oam.getTU().getFilePath();
-        //String f2 = editor_.getInputFile().getLocation().toOSString();
-        IEditorInput ieu = editor_.getEditorInput();
-        IFile inputFile=null;
-        if(ieu instanceof IFileEditorInput){
-        	inputFile = ((IFileEditorInput)ieu).getFile();//cdt40
-        }
-        else{
-        	showMessage(TITLE, "Cannot locate file in editor");//cdt40
-        	return;
-        }
-
-        if (!oam.getTU().getFilePath().equals(inputFile.getLocation().toOSString())) {//cdt40
-            showMessage(TITLE, "OpenMP analysis required on editor file");
-            return;
-        }
-        
-        if (oam.getFileMap()==null) {
-            showMessage(TITLE, "Internal Error: no file map");
-            return;
-        }
-        
-        IASTNode node = oam.getFileMap().find(selection.getOffset(), 1);  // only 1 - where we are
-        if (node==null) {
-            showMessage(TITLE, "Cannot locate statement at given selection point");
-            return;
-        }
-        
-        removeConcurrencyMarkers(editor_.getDocumentProvider().getAnnotationModel(editor_.getEditorInput()));
-        
-        Set cSet = oam.getNodesConcurrentTo(node);
-        
-        // Display all concurrent statements
-        for(Iterator i=cSet.iterator(); i.hasNext();) {
-            IASTNode n = (IASTNode)i.next();
-            showNode(n, OpenMpIDs.ConcurrencyType);
-        }
-        
-        // If node is not concurrent to itself, we adopt a different marker color
-        if (!cSet.contains(node))
-           showNode(node, OpenMpIDs.NonConcurrencyType); 
-        
-        // select the key stmt
-        Utility.Location l = Utility.getLocation(node);
-        editor_.selectAndReveal(l.low_, l.high_-l.low_+1); 
-
-    }
-    
-    /**
-     * showNode - Show the node of the right marker type
-     * @param node       - IASTNode
-     * @param markerType - String 
-     */
-    protected void showNode(IASTNode node, String markerType)
-    {
-        Utility.Location l = Utility.getLocation(node);
-
-        
-        IAnnotationModel am = editor_.getDocumentProvider().getAnnotationModel(editor_.getEditorInput());
-        
-        // We need to add an annotation type to the annotation painter (see SourceViewerDecorationSupport)
-        Annotation a = new Annotation(markerType, true, "Hi");
-        int end = l.high_-l.low_+1;
-        Position   p = new Position(l.low_, end);
-        am.addAnnotation(a, p);
-        
-        //System.out.println("annotate node="+node.getClass().toString()+" begin="+l.low_+" end="+end);
-    }
-    
-    /**
-     * remove the concurrency markers from the screen
-     * @param am - IAnnotationModel
-     */
-    public static void removeConcurrencyMarkers(IAnnotationModel am)
-    {
-        LinkedList ais = new LinkedList();
-        for(Iterator ai=am.getAnnotationIterator(); ai.hasNext();) { ais.add(ai.next()); }
-        for(Iterator it=ais.iterator(); it.hasNext();) {
-            Annotation a = (Annotation)it.next();
-            if (a.getType().equals(OpenMpIDs.ConcurrencyType) || a.getType().equals(OpenMpIDs.NonConcurrencyType)) {
-                am.removeAnnotation(a);
-            }
-        }
-    }
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/.classpath b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.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/tools/pldt/org.eclipse.ptp.pldt.openmp.core/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/.cvsignore
deleted file mode 100644
index 47e3103..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-@dot

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/.project b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/.project
deleted file mode 100644
index 4959a5e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.openmp.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/tools/pldt/org.eclipse.ptp.pldt.openmp.core/.settings/org.eclipse.jdt.core.prefs b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6bbf0a1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/.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.core/META-INF/MANIFEST.MF b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 9f29d23..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/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.pldt.openmp.core; singleton:=true
-Bundle-Version: 4.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.pldt.openmp.core.OpenMPPlugin
-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.ui.ide,
- org.eclipse.ui.editors,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ptp.pldt.openmp.analysis,
- org.eclipse.ptp.pldt.openmp.ui.pv,
- org.eclipse.photran.cdtinterface;resolution:=optional,
- org.eclipse.photran.core;resolution:=optional,
- org.eclipse.photran.core.vpg;resolution:=optional
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Export-Package: org.eclipse.ptp.pldt.openmp.core,
- org.eclipse.ptp.pldt.openmp.core.actions,
- org.eclipse.ptp.pldt.openmp.core.prefs
-Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/about.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/build.properties b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/build.properties
deleted file mode 100644
index 04cc212..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/build.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               icons/,\
-               samples/,\
-               plugin.properties,\
-               html/,\
-               about.html
-bin.excludes = icons/.cvsignore

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/get_num_procs.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/get_num_procs.html
deleted file mode 100644
index 1b9fb95..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/get_num_procs.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>get_num_procs</title>
-<body>
-<H3>get_num_procs</H3>
-<PRE>
-int get_num_procs(void)
-</PRE>
-<DL><DD>
-This function returns the maximum number of processors that could be assigned to the program.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/get_thread_num.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/get_thread_num.html
deleted file mode 100644
index 7e6d454..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/get_thread_num.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>get_thread_num</title>
-<body>
-<H3>get_thread_num</H3>
-<PRE>
-int get_thread_num(void)
-</PRE>
-<DL><DD>
-This function returns the thread number, within its team, of the thread executing the function. The thread number lies between 0 and omp_get_num_threads()-1, inclusive. The master thread of the team is thread 0.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_destroy_lock.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_destroy_lock.html
deleted file mode 100644
index d047792..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_destroy_lock.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_destroy_lock</title>
-<body>
-<H3>omp_destroy_lock</H3>
-<PRE>
-void omp_destroy_lock(omp_lock_t *lock)
-</PRE>
-<DL><DD>
-Ensures that the specified lock variable lock is uninitialized.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_destroy_nest_lock.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_destroy_nest_lock.html
deleted file mode 100644
index 58a4513..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_destroy_nest_lock.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_destroy_nest_lock</title>
-<body>
-<H3>omp_destroy_nest_lock</H3>
-<PRE>
-void omp_destroy_nest_lock(omp_nest_lock_t *lock)
-</PRE>
-<DL><DD>
-Ensures that the specified lock variable lock is uninitialized.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_dynamic.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_dynamic.html
deleted file mode 100644
index 16ccccc..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_dynamic.html
+++ /dev/null

@@ -1,10 +0,0 @@
-<html><head><title>omp_get_dynamic</title>
-<body>
-<H3>omp_get_dynamic</H3>
-<PRE>
-int omp_get_dynamic(void)
-</PRE>
-<DL><DD>
-This function returns non-zero if dynamic thread adjustments 
-are enabled and returns 0 otherwise.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_max_threads.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_max_threads.html
deleted file mode 100644
index 06acf7a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_max_threads.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_get_max_threads</title>
-<body>
-<H3>omp_get_max_threads</H3>
-<PRE>
-int omp_get_max_threads(void)
-</PRE>
-<DL><DD>
-This function returns the maximum value that can be returned by calls to omp_get_num_threads.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_nested.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_nested.html
deleted file mode 100644
index 62d7db3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_nested.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_get_nested</title>
-<body>
-<H3>omp_get_nested</H3>
-<PRE>
-int This function returns non-zero if nested parallelism is enabled and 0 if it is disabled.(void)
-</PRE>
-<DL><DD>
-omp_get_nested description
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_num_threads.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_num_threads.html
deleted file mode 100644
index b7d4e62..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_num_threads.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_get_num_threads</title>
-<body>
-<H3>omp_get_num_threads</H3>
-<PRE>
-int omp_get_num_threads(int num_threads)
-</PRE>
-<DL><DD>
-This function returns the number of threads currently in the team executing the parallel region from which it is called.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_wtick.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_wtick.html
deleted file mode 100644
index 767d869..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_wtick.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_get_wtick</title>
-<body>
-<H3>omp_get_wtick</H3>
-<PRE>
-double omp_get_wtick(void)
-</PRE>
-<DL><DD>
-Returns the number of seconds between clock ticks.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_wtime.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_wtime.html
deleted file mode 100644
index 70fc71d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_get_wtime.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_get_wtime</title>
-<body>
-<H3>omp_get_wtime</H3>
-<PRE>
-double omp_get_wtime(void)
-</PRE>
-<DL><DD>
-Returns the time elapsed from a fixed starting time. The value of the fixed starting time is determined at the start of the current program, and remains constant throughout program execution.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_in_parallel.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_in_parallel.html
deleted file mode 100644
index 5006835..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_in_parallel.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_in_parallel</title>
-<body>
-<H3>omp_in_parallel</H3>
-<PRE>
-int omp_in_parallel(void)
-</PRE>
-<DL><DD>
-This function returns non-zero if it is called within the dynamic extent of a parallel region executing in parallel; otherwise, it returns 0.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_init_lock.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_init_lock.html
deleted file mode 100644
index 5de7496..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_init_lock.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_init_lock</title>
-<body>
-<H3>omp_init_lock</H3>
-<PRE>
-void omp_init_lock(omp_lock_t *lock)
-</PRE>
-<DL><DD>
-These functions (this and omp_init_nest_lock) provide the only means of initializing a lock. Each function initializes the lock associated with the parameter lock for use in subsequent calls.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_init_nest_lock.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_init_nest_lock.html
deleted file mode 100644
index ed5c683..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_init_nest_lock.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_init_nest_lock</title>
-<body>
-<H3>omp_init_nest_lock</H3>
-<PRE>
-void omp_init_nest_lock(omp_nest_lock_t *lock)
-</PRE>
-<DL><DD>
-These functions (this and omp_init_lock) provide the only means of initializing a lock. Each function initializes the lock associated with the parameter lock for use in subsequent calls.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_dynamic.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_dynamic.html
deleted file mode 100644
index 777e2b9..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_dynamic.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_set_dynamic</title>
-<body>
-<H3>omp_set_dynamic</H3>
-<PRE>
-void omp_set_dynamic(int dynamic_threads)
-</PRE>
-<DL><DD>
-This function enables or disables dynamic adjustment of the number of threads available for execution of parallel regions.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_lock.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_lock.html
deleted file mode 100644
index 746309c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_lock.html
+++ /dev/null

@@ -1,13 +0,0 @@
-<html><head><title>omp_set_lock</title>
-<body>
-<H3>omp_set_lock</H3>
-<PRE>
-void omp_set_lock(omp_lock_t *lock)
-</PRE>
-<DL><DD>
-Blocks the thread executing the function until the 
-specified lock is available and then sets the lock. 
-A simple lock is available if it is unlocked. 
-A nestable lock is available if it is unlocked or if it is 
-already owned by the thread executing the function.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_nest_lock.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_nest_lock.html
deleted file mode 100644
index 2ed4e87..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_nest_lock.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_set_nest_lock</title>
-<body>
-<H3>omp_set_nest_lock</H3>
-<PRE>
-void omp_set_nest_lock(omp_nest_lock_t *lock)
-</PRE>
-<DL><DD>
-Blocks the thread executing the function until the specified lock is available and then sets the lock. A simple lock is available if it is unlocked. A nestable lock is available if it is unlocked or if it is already owned by the thread executing the function.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_nested.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_nested.html
deleted file mode 100644
index 6100cfd..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_nested.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_set_nested</title>
-<body>
-<H3>omp_set_nested</H3>
-<PRE>
-void omp_set_nested(int nested)
-</PRE>
-<DL><DD>
-This function enables or disables nested parallelism.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_num_threads.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_num_threads.html
deleted file mode 100644
index ad7f71d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_set_num_threads.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_set_num_threads</title>
-<body>
-<H3>omp_set_num_threads</H3>
-<PRE>
-void omp_set_num_threads(int num_threads)
-</PRE>
-<DL><DD>
-Sets the number of threads that will be used in the next parallel region
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_test_lock.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_test_lock.html
deleted file mode 100644
index 1a0ce49..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_test_lock.html
+++ /dev/null

@@ -1,10 +0,0 @@
-<html><head><title>omp_test_lock</title>
-<body>
-<H3>omp_test_lock</H3>
-<PRE>
-int omp_test_lock(omp_lock_t *lock2)
-</PRE>
-<DL><DD>
-Attempts to set a lock but does not block execution of the thread.
-<!--  BRT return value? -->
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_test_nest_lock.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_test_nest_lock.html
deleted file mode 100644
index 1df8e60..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_test_nest_lock.html
+++ /dev/null

@@ -1,10 +0,0 @@
-<html><head><title>omp_test_nest_lock</title>
-<body>
-<H3>omp_test_nest_lock</H3>
-<PRE>
-int omp_test_nest_lock(omp_nest_lock_t *lock)
-</PRE>
-<DL><DD>
-Attempts to set a lock but does not block execution of the thread.
-<!--  BRT return value? -->
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_unset_lock.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_unset_lock.html
deleted file mode 100644
index f4427db..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_unset_lock.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_unset_lock</title>
-<body>
-<H3>omp_unset_lock</H3>
-<PRE>
-void omp_unset_lock(omp_lock_t *lock)
-</PRE>
-<DL><DD>
-Provides the means of releasing ownership of a lock.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_unset_nest_lock.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_unset_nest_lock.html
deleted file mode 100644
index 3f9722c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/html/omp_unset_nest_lock.html
+++ /dev/null

@@ -1,9 +0,0 @@
-<html><head><title>omp_unset_nest_lock</title>
-<body>
-<H3>omp_unset_nest_lock</H3>
-<PRE>
-void omp_unset_nest_lock(omp_nest_lock_t *lock)
-</PRE>
-<DL><DD>
-Provides the means of releasing ownership of a lock.
-<P></DL></font></body></html>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/.cvsignore
deleted file mode 100644
index 1e6043c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/.cvsignore
+++ /dev/null

@@ -1,11 +0,0 @@
-compunity_logo2.gif
-lll.gif
-noLLL.gif
-openmp_logo.gif
-openmp_logoTemp.gif
-openMPI-icon.gif
-openMPwebLogo.gif
-pspbrwse.jbf
-temp.gif
-zznoOpenMP.gif
-zzopenMP.gif

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/noOpenMP.gif b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/noOpenMP.gif
deleted file mode 100644
index 2d8d5ce..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/noOpenMP.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/openMP.gif b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/openMP.gif
deleted file mode 100644
index 02e0993..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/openMP.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/openMPerr.gif b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/openMPerr.gif
deleted file mode 100644
index 6786012..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/openMPerr.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/openMPproblem.gif b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/openMPproblem.gif
deleted file mode 100644
index 16bdc3f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/openMPproblem.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/problem.gif b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/problem.gif
deleted file mode 100644
index 40ef930..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/icons/problem.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/include/omptest.h b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/include/omptest.h
deleted file mode 100644
index f40b0a0..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/include/omptest.h
+++ /dev/null

@@ -1,32 +0,0 @@
-// from http://docs.hp.com/en/B3901-90015/ch08s03.html (good docs here too)
-#ifndef _OPENMP_H
-#define _OPENMP_H 
-
-void omp_set_num_threads(int num_threads);
-int omp_get_num_threads(void);
-int omp_get_max_threads(void);
-int omp_get_thread_num(void);
-int omp_get_num_procs(void);
-int omp_in_parallel(void);
-void omp_set_dynamic(int dynamic_threads);
-int omp_get_dynamic(void);
-void omp_set_nested(int nested);
-int omp_get_nested(void);
-
-// typedef to quiet the errors only. TESTING ONLY
-typedef int omp_lock_t;
-typedef int omp_nest_lock_t;
-
-void omp_init_lock(omp_lock_t *lock);
-void omp_init_nest_lock(omp_nest_lock_t *lock);
-void omp_destroy_lock(omp_lock_t *lock);
-void omp_destroy_nest_lock(omp_nest_lock_t *lock);
-void omp_set_lock(omp_lock_t *lock);
-void omp_set_nest_lock(omp_nest_lock_t *lock);
-void omp_unset_lock(omp_lock_t *lock);
-void omp_unset_nest_lock(omp_nest_lock_t *lock);
-int omp_test_lock(omp_lock_t *lock);
-int omp_test_nest_lock(omp_nest_lock_t *lock);
-double omp_get_wtime(void);
-double omp_get_wtick(void);
-#endif

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/plugin.properties b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/plugin.properties
deleted file mode 100644
index 191fca1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/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.core/plugin.xml b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/plugin.xml
deleted file mode 100644
index 1d1991c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/plugin.xml
+++ /dev/null

@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   <extension
-         point="org.eclipse.ui.views">
-      <view
-            name="%view.name"
-            icon="icons/openMP.gif"
-            category="org.eclipse.ptp.ui.views"
-            class="org.eclipse.ptp.pldt.openmp.core.views.OpenMPArtifactView"
-            id="org.eclipse.ptp.pldt.openmp.core.views.OpenMPArtifactView">
-      </view>
-
-   </extension>
-   <!--  openMP markers -->
-   <!-- MARKER_ID       = "org.eclipse.ptp.pldt.openmp.core.openMPMarker" -->
-   <extension point="org.eclipse.core.resources.markers"
-		id="openMPMarker"
-        name="%extension.name">
-      <super type="org.eclipse.core.resources.textmarker"/>
-      <attribute name="fileName"/>
-      <attribute name="theLineNo"/>
-      <attribute name="columnNo"/>
-      <attribute name="name"/>
-      <attribute name="description"/>
-      <attribute name="constructType"/>
-      <attribute name="uniqueID"/>
-   </extension>
-   <!-- this changes the marker image in the editor marker bar  -->
-   <extension
-         point="org.eclipse.ui.editors.annotationTypes">
-      <type
-            markerType="org.eclipse.ptp.pldt.openmp.core.openMPMarker"
-            name="org.eclipse.ptp.pldt.openmp.core.openMPMarkerAnnotation">
-      </type>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors.markerAnnotationSpecification">
-      <specification
-            annotationType="org.eclipse.ptp.pldt.openmp.core.openMPMarkerAnnotation"
-            icon="icons/openMP.gif" 
-            
-            presentationLayer="5"
-            label="%specification.label"
-            
-            textPreferenceKey="openopenmpndication"
-            textPreferenceValue="true"
-            highlightPreferenceKey="artifactHighlighting"
-            highlightPreferenceValue="false"
-            colorPreferenceKey="artifactIndicationColor"
-            colorPreferenceValue="0,128,192"
-            verticalRulerPreferenceKey="artifactIndicationInVerticalRuler"
-            verticalRulerPreferenceValue="true"
-			showInNextPrevDropdownToolbarActionKey="showOpenopenmpnNextPrevDropdownToolbarAction"
-            showInNextPrevDropdownToolbarAction="false"
-            overviewRulerPreferenceKey="artifactIndicationInOpldt.verviewRuler"
-            overviewRulerPreferenceValue="true"
-            
-            includeOnPreferencePage="true"
-            isGoToPreviousNavigationTargetKey="isopenmpGoToPreviousNavigationTarget"
-
-            isGoToNextNavigationTargetKey="isopenmpRecordGoToNextNavigationTarget"
-            >
-      </specification>  
-   </extension>
-   <extension
-      point="org.eclipse.ui.preferencePages">
-          <page id="org.eclipse.ptp.pldt.openmp.core.prefpage"
-            class="org.eclipse.ptp.pldt.openmp.core.prefs.OpenMPPreferencePage"
-            name="%page.name"
-           category="org.eclipse.ptp.pldt.common.prefs.PLDTPreferencePage"
-  />
-   </extension>
-      <extension
-         point="org.eclipse.cdt.ui.CHelpProvider">
-      <provider
-            class="org.eclipse.ptp.pldt.openmp.core.editorHelp.OpenMPCHelpProvider"
-            id="org.eclipse.ptp.pldt.openmp.core.editorHelp.OpenMPCHelpProvider"/>
-   </extension>
-      <extension
-            point="org.eclipse.ui.commands">
-         <command
-               defaultHandler="org.eclipse.ptp.pldt.openmp.core.actions.RunAnalyseOpenMPcommandHandler"
-               id="org.eclipse.ptp.pldt.openmp.core.command2"
-               name="%command.name">
-         </command>
-      </extension>
-      <extension
-            id="teopenmpD"
-            name="%extension.name.0"
-            point="org.eclipse.ui.menus">
-         <menuContribution
-               locationURI="menu:org.eclipse.ptp.pldt.common.toolbar.command1?after=separator2.openmp">
-            <command
-                  commandId="org.eclipse.ptp.pldt.openmp.core.command2"
-                  icon="icons/openMP.gif"
-                  label="%command.label"
-                  style="push">
-            </command>
-         </menuContribution>
-      </extension>
-      <extension
-            point="org.eclipse.core.runtime.preferences">
-         <initializer
-               class="org.eclipse.ptp.pldt.openmp.core.prefs.OpenMPPreferenceInitializer">
-         </initializer>
-      </extension>
-</plugin>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/samples/CFile.c b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/samples/CFile.c
deleted file mode 100644
index 54fbbf7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/samples/CFile.c
+++ /dev/null

@@ -1,26 +0,0 @@
-
-
-void computeFunction(double [][] value, int m, int n)
-{
-  int i,j,maxiter,x,y;
-  double total_iters=0;
-#pragma omp parallel for private(j, x, y) reduction(+:total_iters)
-  for(i=0; i<m; i++)   {
-  	for(j=0; j<n; j++) {
-  		x = i/(double)m;
-  		y = j/(double)n;
-  		value[i,j] = mandel_val(x,y,maxiter);
-  		total_iters = total_iters+value[i,j];
-  	}
-  }
-  
-  #pragma omp sections
-  {
-  	#pragma omp section
-    {  i=total_iters; }
-  	
-  	#pragma omp section
-  	{  j=total_iters+m*n; }
-  }
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/samples/testOpenMP.c b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/samples/testOpenMP.c
deleted file mode 100644
index 3f9aaaa..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/samples/testOpenMP.c
+++ /dev/null

@@ -1,34 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>  // for omp sample
-#include <math.h>    // for omp
-#include "omp.h"
-
-
-// Sample dummy OpenMP program
-
-
-int main(int argc, char* argv[]){
-	int    i,arraySize;
-	double *x, *y;     /* the arrays                 */
-	printf("Hello OpenMP World.\n");
-
-// sample openMP API
-	if (omp_in_parallel()){
-		printf("true");
-	}
-	  /* Allocate memory for the arrays. */
-  x = (double *) malloc( (size_t) (  arraySize * sizeof(double) ) );
-  y = (double *) malloc( (size_t) (  arraySize * sizeof(double) ) );
-
-  /* Here's the OpenMP pragma that parallelizes the for-loop. */
-#pragma omp parallel for
-  for ( i = 0; i < arraySize; i++ )
-    {
-      y[i] = sin( exp( cos( - exp( sin(x[i]) ) ) ) );
-    }
-
-
-	return 0;
-}
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPArtifactMarkingVisitor.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPArtifactMarkingVisitor.java
deleted file mode 100644
index 39093cf..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPArtifactMarkingVisitor.java
+++ /dev/null

@@ -1,23 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005,2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.core;
-
-import org.eclipse.ptp.pldt.common.ArtifactMarkingVisitor;
-
-
-
-public class OpenMPArtifactMarkingVisitor extends ArtifactMarkingVisitor
-{
-    public OpenMPArtifactMarkingVisitor(String markerId)
-    {
-        super(markerId);
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPIDs.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPIDs.java
deleted file mode 100644
index c2aeee4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPIDs.java
+++ /dev/null

@@ -1,28 +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.openmp.core;
-
-import org.eclipse.ptp.pldt.openmp.core.messages.Messages;
-
-/**
- * General IDs - moved to internal class, shouldn't be needed outside this project
- * @author Beth Tibbitts
- * @deprecated 
- * @see org.eclipse.ptp.pldt.openmp.internal.core
- * 
- *
- */
-public class OpenMPIDs {
- 
-	public static final String OpenMP_INCLUDES = Messages.OpenMPIDs_OpenMP_includes;
-	public static final String OpenMP_BUILD_CMD = "gcc -fopenmp"; //$NON-NLS-1$
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPPlugin.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPPlugin.java
deleted file mode 100644
index 91e1d0a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPPlugin.java
+++ /dev/null

@@ -1,102 +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.openmp.core;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.pldt.openmp.core.messages.Messages;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class OpenMPPlugin extends AbstractUIPlugin {
-
-	//The shared instance.
-	private static OpenMPPlugin plugin;
-    public static final String PLUGIN_ID = "org.eclipse.ptp.pldt.openmp.core"; //$NON-NLS-1$
-	
-    // Constants
-    // preference page name for OpenMP
-    public static final String OPEN_MP_INCLUDES    = Messages.OpenMPPlugin_OpenMP_includes;
-    
-    public static final String MARKER_ID       = "org.eclipse.ptp.pldt.openmp.core.openMPMarker"; //$NON-NLS-1$
-   
-    // artifact view id
-    public static final String VIEW_ID = "org.eclipse.ptp.pldt.openmp.core.views.OpenMPArtifactView"; //$NON-NLS-1$
-
-	/**
-	 * The constructor.
-	 */
-	public OpenMPPlugin() {
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static OpenMPPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.ptp.pldt.openmp.core", path); //$NON-NLS-1$
-	}
-    /**
-     * Returns the preference setting for OpenMP include paths
-     * 
-     * @return
-     */
-    public List<String> getIncludeDirs()
-    {
-        String stringList = getPluginPreferences().getString(OPEN_MP_INCLUDES);
-        StringTokenizer st = new StringTokenizer(stringList, File.pathSeparator + "\n\r");//$NON-NLS-1$
-        List<String> dirs = new ArrayList<String>();
-        while (st.hasMoreElements()) {
-            dirs.add(st.nextToken());
-        }
-        return dirs;
-    }
-
-    public static String getPluginId()
-    {
-        return PLUGIN_ID;
-    }
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPScanReturn.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPScanReturn.java
deleted file mode 100644
index 2c82790..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/OpenMPScanReturn.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2006,2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.openmp.core;
-
-
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.ptp.pldt.common.Artifact;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.openmp.analysis.OpenMPError;
-
-/**
- * Save specific information on OpenMP artifacts and problems
- * 
- * @author Donald P Pazel
- */
-public class OpenMPScanReturn extends ScanReturn
-{
-    private LinkedList<OpenMPError> problems_ = new LinkedList<OpenMPError>();  
-    
-    /**
-     * OpenMPScanReturn - constructor
-     *
-     */
-    public OpenMPScanReturn()
-    {
-       super();   
-    }
-
-    /**
-     * addOpenMPArtifact - add a pragma to the pragma list
-     * @param a
-     */
-    public void addOpenMPArtifact(Artifact a)
-    {
-        addArtifact(a);
-    }
-
-    /**
-     * getOpenMPList - get the pragma list
-     * @return
-     */
-    public List<Artifact> getOpenMPList()
-    {
-        return getArtifactList();
-    }
-    
-
-    /**
-     * addProblemst - add a set of problems to the list
-     * @param errors - LinkedList
-     */
-    public void addProblems(LinkedList<OpenMPError> errors)
-    {
-        if (errors.size()>0)  // 0 sized appends seem to add junk to problems_
-          problems_.addAll(errors);
-    }
-
-    /**
-     * getProblems - accessor to problems list
-     * @return
-     */
-    public LinkedList<OpenMPError> getProblems()
-    {
-        return problems_;
-    }
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/actions/AnalyseOpenMPFortranHandler.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/actions/AnalyseOpenMPFortranHandler.java
deleted file mode 100644
index a4acd16..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/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.core.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.core.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.core/src/org/eclipse/ptp/pldt/openmp/core/actions/RunAnalyseOpenMPcommandHandler.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/actions/RunAnalyseOpenMPcommandHandler.java
deleted file mode 100644
index 24542a6..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/actions/RunAnalyseOpenMPcommandHandler.java
+++ /dev/null

@@ -1,282 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2007,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.core.actions;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
-import org.eclipse.cdt.core.dom.ast.IASTNodeLocation;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.ast.gnu.c.GCCLanguage;
-import org.eclipse.cdt.core.dom.ast.gnu.cpp.GPPLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.model.ITranslationUnit;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.pldt.common.Artifact;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.actions.RunAnalyseHandlerBase;
-import org.eclipse.ptp.pldt.common.util.SourceInfo;
-import org.eclipse.ptp.pldt.common.util.ViewActivator;
-import org.eclipse.ptp.pldt.openmp.analysis.OpenMPAnalysisManager;
-import org.eclipse.ptp.pldt.openmp.analysis.OpenMPError;
-import org.eclipse.ptp.pldt.openmp.analysis.OpenMPErrorManager;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTNode;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTPragma;
-import org.eclipse.ptp.pldt.openmp.core.OpenMPArtifactMarkingVisitor;
-import org.eclipse.ptp.pldt.openmp.core.OpenMPPlugin;
-import org.eclipse.ptp.pldt.openmp.core.OpenMPScanReturn;
-import org.eclipse.ptp.pldt.openmp.core.analysis.OpenMPCASTVisitor;
-import org.eclipse.ptp.pldt.openmp.core.messages.Messages;
-import org.eclipse.ptp.pldt.openmp.internal.core.OpenMPIDs;
-import org.eclipse.ptp.pldt.openmp.ui.pv.PvPlugin;
-import org.eclipse.ptp.pldt.openmp.ui.pv.views.ProblemMarkerAttrIds;
-import org.eclipse.ui.texteditor.MarkerUtilities;
-
-/**
- * @author tibbitts
- * @since 4.0
- * 
- */
-public class RunAnalyseOpenMPcommandHandler extends RunAnalyseHandlerBase {
-	private static final String OPENMP_DIRECTIVE = Messages.RunAnalyseOpenMPcommandHandler_OpenMP_directive;
-	private static final boolean traceOn = false;
-
-	/**
-	 * Constructor for the "Run Analysis" action
-	 */
-	public RunAnalyseOpenMPcommandHandler() {
-		super("OpenMP", new OpenMPArtifactMarkingVisitor(OpenMPPlugin.MARKER_ID), OpenMPPlugin.MARKER_ID); //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns OpenMP analysis artifacts for file
-	 * 
-	 * @param file
-	 * @param includes
-	 *            OpenMP include paths
-	 * @return
-	 */
-	@Override
-	public ScanReturn doArtifactAnalysis(final ITranslationUnit tu, final List<String> includes) {
-		OpenMPScanReturn msr = new OpenMPScanReturn();
-		final String fileName = tu.getElementName();
-		IASTTranslationUnit atu = null;
-		ILanguage lang;
-		boolean allowPrefixOnlyMatch=OpenMPPlugin.getDefault().getPreferenceStore().getBoolean(OpenMPIDs.OPENMP_RECOGNIZE_APIS_BY_PREFIX_ALONE);
-		try {
-			lang = tu.getLanguage();
-
-			atu = tu.getAST();
-			String languageID = lang.getId();
-			
-			if(languageID.equals(GCCLanguage.ID) || languageID.equals(GPPLanguage.ID)) {
-				// null IASTTranslationUnit when we're doing C/C++ means we should quit.
-				// but want to continue to see if this is a fortran file we are analyzing.
-				if(atu==null) {// this is null for Fortran file during JUnit testing.
-					System.out.println("RunAnalyseOpenMPCommandHandler.doArtifactAnalysis(), atu is null (testing?)");
-					return msr;
-				}
-			}
-			
-			if (languageID.equals(GCCLanguage.ID)) {// cdt40
-				atu.accept(new OpenMPCASTVisitor(includes, fileName, allowPrefixOnlyMatch, msr));
-			} else {
-				// Attempt to handle Fortran
-				// Instantiate using reflection to avoid static Photran
-				// dependencies
-				try {
-					Class<?> c = Class.forName("org.eclipse.ptp.pldt.openmp.core.actions.AnalyseOpenMPFortranHandler"); //$NON-NLS-1$
-					Method method = c.getMethod("run", String.class, ITranslationUnit.class, String.class, ScanReturn.class); //$NON-NLS-1$
-					method.invoke(c.newInstance(), languageID, tu, fileName, msr);
-				} catch (Exception e) {
-					System.err.println("RunAnalyseOpenMPcommandHandler.doArtifactAnalysis: Photran not installed"); //$NON-NLS-1$
-				}
-			}
-		} catch (CoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		IResource res = tu.getResource();
-		IFile file = null;
-		if (res instanceof IFile) {
-			file = (IFile) res;
-		} else {
-			System.out.println("RunAnalyseOpenMP.doArtifactAnalysis, file cast won't work..."); //$NON-NLS-1$
-		}
-		// Find the OpenMP #pragmas
-		if (atu != null) { // not for Fortran
-			processOpenMPPragmas(msr, atu, file);
-		}
-		return msr;
-	}
-
-	/**
-	 * Special processing to find #pragmas, since the CDT AST does not normally
-	 * include them.<br>
-	 * Also adds the "OpenMP Problems"
-	 * 
-	 * @param msr
-	 * @param astTransUnit
-	 * @param iFile
-	 */
-	protected void processOpenMPPragmas(OpenMPScanReturn msr, IASTTranslationUnit astTransUnit, IFile iFile) {
-		OpenMPAnalysisManager omgr = new OpenMPAnalysisManager(astTransUnit, iFile);
-		PASTNode[] pList = omgr.getPAST();
-
-		for (int i = 0; i < pList.length; i++) {// length local=3271; remote 4 (!!)
-			PASTNode temp=pList[i];
-			String tempStr=temp.getRawSignature();
-			// local: will be a PASTOMPPragma node;   remote: will be a PASTPragma node.
-			// So workaround is to accept a PASTPragma node here so we can handle remote files.
-			// Need to investigate what this does to further analysis e.g. concurrency analysis.
-			if (pList[i] instanceof PASTPragma) {// was PASTOMPPragma
-
-				PASTPragma pop = (PASTPragma) pList[i];
-				if (traceOn)
-					System.out.println("found #pragma, line " + pop.getStartingLine()); //$NON-NLS-1$
-				SourceInfo si = getSourceInfo(pop, Artifact.PRAGMA);
-				String shortName=pop.getContent();
-				if(shortName.length()==0) { 
-					shortName="#pragma"; // HACK: workaround for remote files where getContent() is always empty.
-					// The same reason why this is empty is also (I think) why it's not a PASTOMPPragma node.
-					// PASTOMPFactory.parse() always finds empty token first on a remote file, so aborts.
-				}
-				Artifact a = new Artifact(pop.getFilename(), pop.getStartingLine(), pop.getStartLocation(), shortName,
-						OPENMP_DIRECTIVE, si, pop);
-				msr.addArtifact(a);
-			}
-		}
-
-		msr.addProblems(OpenMPErrorManager.getCurrentErrorManager().getErrors());
-	}
-
-	/**
-	 * Get exact source locational info for a function call
-	 * 
-	 * @param pastNode
-	 * @param constructType
-	 * @return
-	 */
-	private SourceInfo getSourceInfo(PASTNode pastNode, int constructType) {
-		SourceInfo sourceInfo = null;
-		IASTNodeLocation[] locations = pastNode.getNodeLocations();
-		if (locations.length == 1) {
-			IASTFileLocation astFileLocation = null;
-			if (locations[0] instanceof IASTFileLocation) {
-				astFileLocation = (IASTFileLocation) locations[0];
-				sourceInfo = new SourceInfo();
-				sourceInfo.setStartingLine(astFileLocation.getStartingLineNumber());
-				sourceInfo.setStart(astFileLocation.getNodeOffset());
-				sourceInfo.setEnd(astFileLocation.getNodeOffset() + astFileLocation.getNodeLength());
-				sourceInfo.setConstructType(constructType);
-			}
-		}
-		return sourceInfo;
-	}
-
-	/**
-	 * processResults - override from RunAnalyse base, to process both pragma
-	 * artifacts and problems
-	 */
-	@Override
-	protected void processResults(ScanReturn results, IResource resource) {
-		assert (results instanceof OpenMPScanReturn);
-
-		OpenMPScanReturn osr = (OpenMPScanReturn) results;
-
-		// This is for the openmp pragma view
-		List<Artifact> artifacts = osr.getOpenMPList();
-		visitor.visitFile(resource, artifacts);
-
-		// remove problems
-		removeProblemMarkers(resource);
-
-		// DPP - put in stuff for problems view
-		// Just subclass scanreturn and create markers for problems view here
-		List<OpenMPError> problems = osr.getProblems();
-		if (traceOn)
-			System.out.println("RunAnalyseOpenMP.processResults, have " + problems.size() + " problems."); //$NON-NLS-1$ //$NON-NLS-2$
-		try {
-			for (Iterator<OpenMPError> i = problems.iterator(); i.hasNext();)
-				processProblem(i.next(), resource);
-		} catch (CoreException e) {
-			System.out.println("RunAnalysisOpenMP.processResults exception: " //$NON-NLS-1$
-					+ e);
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Create problem marker which will put a problem on the OpenMP problems
-	 * view
-	 * 
-	 * @param problem
-	 *            - OpenMPError
-	 * @param resource
-	 *            - IResource
-	 * @throws CoreException
-	 */
-	private void processProblem(OpenMPError problem, IResource resource) throws CoreException {
-		// build all the attributes
-		Map attrs = new HashMap();
-		attrs.put(ProblemMarkerAttrIds.DESCRIPTION, problem.getDescription());
-		attrs.put(ProblemMarkerAttrIds.RESOURCE, problem.getFilename());
-		attrs.put(ProblemMarkerAttrIds.INFOLDER, problem.getPath());
-		attrs.put(ProblemMarkerAttrIds.LOCATION, new Integer(problem.getLineno()));
-		// used to reference problem if need
-		attrs.put(ProblemMarkerAttrIds.PROBLEMOBJECT, problem);
-
-		// create the marker all at once, so get ONLY a single resourceChange
-		// event.
-		MarkerUtilities.createMarker(resource, attrs, ProblemMarkerAttrIds.MARKER_ERROR_ID);
-
-	}
-
-	/**
-	 * Remove the OpenMP problem markers currently set on a resource.
-	 * 
-	 * @param resource
-	 *            - IResource
-	 */
-	private void removeProblemMarkers(IResource resource) {
-		try {
-			resource.deleteMarkers(ProblemMarkerAttrIds.MARKER_ERROR_ID, false, IResource.DEPTH_INFINITE);
-		} catch (CoreException e) {
-			System.out.println(e);
-			System.out.println(e.toString());
-			System.out.println("Problem deleting markers on OMP Problems: " //$NON-NLS-1$
-					+ resource.getProjectRelativePath());
-		}
-	}
-
-	@Override
-	protected List<String> getIncludePath() {
-		return OpenMPPlugin.getDefault().getIncludeDirs();
-	}
-
-	@Override
-	protected void activateArtifactView() {
-		ViewActivator.activateView(OpenMPPlugin.VIEW_ID);
-	}
-
-	@Override
-	protected void activateProblemsView() {
-		ViewActivator.activateView(PvPlugin.VIEW_ID);
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/analysis/OpenMPCASTVisitor.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/analysis/OpenMPCASTVisitor.java
deleted file mode 100644
index a8e2aac..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/analysis/OpenMPCASTVisitor.java
+++ /dev/null

@@ -1,73 +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.openmp.core.analysis;
-
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionCallExpression;
-import org.eclipse.cdt.core.dom.ast.IASTIdExpression;
-import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.analysis.PldtAstVisitor;
-import org.eclipse.ptp.pldt.openmp.core.messages.Messages;
-
-
-/**
- * This dom-walker collects OpenMP related constructs (currently function calls and constants), and add markers to the
- * source file for C code. Currently, it delegates work to MpiGeneralASTVisitorBehavior.
- * 
- */
-public class OpenMPCASTVisitor extends PldtAstVisitor
-{
-    {
-        this.shouldVisitExpressions = true;
-        this.shouldVisitStatements = true;
-        this.shouldVisitDeclarations = true;
-        this.shouldVisitTranslationUnit = true;
-    }
-
-
-    public OpenMPCASTVisitor(List<String> includes, String fileName, boolean allowPrefixOnlyMatch, ScanReturn msr)
-    {
-        super(includes, fileName, allowPrefixOnlyMatch, msr);
-        ARTIFACT_CALL = Messages.OpenMPCASTVisitor_OpenMP_Call;
-		ARTIFACT_CONSTANT=Messages.OpenMPCASTVisitor_OpenMP_Constant;
-    }
-    public void newAPI() {}
-
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTExpression)
-     */
-    private static final String PREFIX="omp_"; //$NON-NLS-1$
-    public int visit(IASTExpression expression)
-    {
-        if (expression instanceof IASTFunctionCallExpression) {
-            IASTExpression astExpr = ((IASTFunctionCallExpression) expression).getFunctionNameExpression();
-            String signature = astExpr.getRawSignature();
-            //System.out.println("func signature=" + signature);
-            if (signature.startsWith(PREFIX)) {
-                if (astExpr instanceof IASTIdExpression) {
-                    IASTName funcName = ((IASTIdExpression) astExpr).getName();
-                    processFuncName(funcName, astExpr);
-                }
-            }
-        } else if (expression instanceof IASTLiteralExpression) {
-            processMacroLiteral((IASTLiteralExpression) expression);
-        }
-        return PROCESS_CONTINUE;
-    }
-}
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/analysis/OpenMPFortranASTVisitor.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/analysis/OpenMPFortranASTVisitor.java
deleted file mode 100644
index f73a91f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/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.core.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.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/editorHelp/Messages.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/editorHelp/Messages.java
deleted file mode 100644
index 942cc17..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/editorHelp/Messages.java
+++ /dev/null

@@ -1,48 +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.core.editorHelp;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.pldt.openmp.core.editorHelp.messages"; //$NON-NLS-1$
-	public static String OpenMPCHelpBook_destroy_lock;
-	public static String OpenMPCHelpBook_destroy_nest_lock;
-	public static String OpenMPCHelpBook_init_lock;
-	public static String OpenMPCHelpBook_get_dynamic;
-	public static String OpenMPCHelpBook_get_max_threads;
-	public static String OpenMPCHelpBook_get_nested;
-	public static String OpenMPCHelpBook_get_num_procs;
-	public static String OpenMPCHelpBook_get_num_threads;
-	public static String OpenMPCHelpBook_get_thread_num;
-	public static String OpenMPCHelpBook_get_wtick;
-	public static String OpenMPCHelpBook_get_wtime;
-	public static String OpenMPCHelpBook_in_parallel;
-	public static String OpenMPCHelpBook_nest_lock;
-	public static String OpenMPCHelpBook_omp_c_and_fortran_help_book_title;
-	public static String OpenMPCHelpBook_set_dynamic;
-	public static String OpenMPCHelpBook_set_lock;
-	public static String OpenMPCHelpBook_set_nest_lock;
-	public static String OpenMPCHelpBook_set_nested;
-	public static String OpenMPCHelpBook_set_num_threads;
-	public static String OpenMPCHelpBook_test_lock;
-	public static String OpenMPCHelpBook_test_nest_lock;
-	public static String OpenMPCHelpBook_unset_lock;
-	public static String OpenMPCHelpBook_unset_nest_lock;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/editorHelp/OpenMPCHelpBook.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/editorHelp/OpenMPCHelpBook.java
deleted file mode 100644
index 58233cd..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/editorHelp/OpenMPCHelpBook.java
+++ /dev/null

@@ -1,222 +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.openmp.core.editorHelp;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.cdt.ui.IFunctionSummary;
-import org.eclipse.cdt.ui.IFunctionSummary.IFunctionPrototypeSummary;
-import org.eclipse.ptp.pldt.common.editorHelp.CHelpBookImpl;
-import org.eclipse.ptp.pldt.common.editorHelp.FunctionPrototypeSummaryImpl;
-import org.eclipse.ptp.pldt.common.editorHelp.FunctionSummaryImpl;
-import org.eclipse.ptp.pldt.openmp.core.OpenMPPlugin;
-
-/**
- * Provide help for OpenMP APIs.<br>
- * This includes hover help, F1 help, and content assist (ctrl-space)
- * @author tibbitts
- *
- */
-public class OpenMPCHelpBook extends CHelpBookImpl {
-	private static final String TITLE = Messages.OpenMPCHelpBook_omp_c_and_fortran_help_book_title;
-
-	public OpenMPCHelpBook() {
-		super(OpenMPPlugin.getPluginId());
-		// populate func map
-		funcName2FuncInfo=makeFunctionMap();
-
-		// set title
-		setTitle(TITLE);
-	}
-
-	/**
-	 * Make function map of API names and info.<br>
-	 * Note this is also used for (one-time) generation of the html
-	 * files by the main() and generateHTML() methods below.
-	 * @return hashmap of the function names and associated info
-	 */
-	private static Map<String, IFunctionSummary> makeFunctionMap() {
-		Map<String, IFunctionSummary> funcMap= new HashMap<String, IFunctionSummary>();
-		funcMap.put("omp_set_num_threads", //$NON-NLS-1$
-						new FunctionSummaryImpl("omp_set_num_threads","", //$NON-NLS-1$ //$NON-NLS-2$
-								Messages.OpenMPCHelpBook_set_num_threads,
-								new FunctionPrototypeSummaryImpl(
-										"omp_set_num_threads", "void", //$NON-NLS-1$ //$NON-NLS-2$
-										"int num_threads"), null)); //$NON-NLS-1$
-
-		funcMap.put("omp_get_num_threads", new FunctionSummaryImpl( //$NON-NLS-1$
-				"omp_get_num_threads", "", Messages.OpenMPCHelpBook_get_num_threads, //$NON-NLS-1$ //$NON-NLS-2$
-				new FunctionPrototypeSummaryImpl("omp_get_num_threads", //$NON-NLS-1$
-						"int", "int num_threads"), null)); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		funcMap.put("omp_get_max_threads", new FunctionSummaryImpl( //$NON-NLS-1$
-				"omp_get_max_threads", "", Messages.OpenMPCHelpBook_get_max_threads, //$NON-NLS-1$ //$NON-NLS-2$
-				new FunctionPrototypeSummaryImpl("omp_get_max_threads", //$NON-NLS-1$
-						"int", "void"), null)); //$NON-NLS-1$ //$NON-NLS-2$
-		funcMap.put("omp_get_thread_num", new FunctionSummaryImpl( //$NON-NLS-1$
-				"get_thread_num", "", Messages.OpenMPCHelpBook_get_thread_num, //$NON-NLS-1$ //$NON-NLS-2$
-				new FunctionPrototypeSummaryImpl("get_thread_num", //$NON-NLS-1$
-						"int", "void"), null)); //$NON-NLS-1$ //$NON-NLS-2$
-		funcMap.put("omp_get_num_procs", new FunctionSummaryImpl( //$NON-NLS-1$
-				"get_num_procs", "", Messages.OpenMPCHelpBook_get_num_procs, //$NON-NLS-1$ //$NON-NLS-2$
-				new FunctionPrototypeSummaryImpl("get_num_procs", "int", //$NON-NLS-1$ //$NON-NLS-2$
-						"void"), null)); //$NON-NLS-1$
-		funcMap.put("omp_in_parallel", new FunctionSummaryImpl( //$NON-NLS-1$
-				"omp_in_parallel", "", //$NON-NLS-1$ //$NON-NLS-2$
-				Messages.OpenMPCHelpBook_in_parallel,
-				new FunctionPrototypeSummaryImpl("omp_in_parallel", "int", //$NON-NLS-1$ //$NON-NLS-2$
-						"void"), null)); //$NON-NLS-1$
-
-		funcMap.put("omp_set_dynamic", new FunctionSummaryImpl( //$NON-NLS-1$
-				"omp_set_dynamic", "", Messages.OpenMPCHelpBook_set_dynamic, //$NON-NLS-1$ //$NON-NLS-2$
-				new FunctionPrototypeSummaryImpl("omp_set_dynamic", //$NON-NLS-1$
-						"void", "int dynamic_threads"), null)); //$NON-NLS-1$ //$NON-NLS-2$
-		funcMap.put("omp_get_dynamic", new FunctionSummaryImpl( //$NON-NLS-1$
-				"omp_get_dynamic", "", Messages.OpenMPCHelpBook_get_dynamic, //$NON-NLS-1$ //$NON-NLS-2$
-				new FunctionPrototypeSummaryImpl("omp_get_dynamic", //$NON-NLS-1$
-						"int", "void"), null)); //$NON-NLS-1$ //$NON-NLS-2$
-
-		funcMap.put("omp_set_nested", new FunctionSummaryImpl( //$NON-NLS-1$
-				"omp_set_nested", "", Messages.OpenMPCHelpBook_set_nested, //$NON-NLS-1$ //$NON-NLS-2$
-				new FunctionPrototypeSummaryImpl("omp_set_nested", //$NON-NLS-1$
-						"void", "int nested"), null)); //$NON-NLS-1$ //$NON-NLS-2$
-		funcMap.put("omp_get_nested", new FunctionSummaryImpl( //$NON-NLS-1$
-				"omp_get_nested", "", Messages.OpenMPCHelpBook_get_nested, //$NON-NLS-1$ //$NON-NLS-2$ 
-				new FunctionPrototypeSummaryImpl("omp_get_nested", //$NON-NLS-1$
-						"int", "void"), null)); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		funcMap.put("omp_init_lock", new FunctionSummaryImpl( //$NON-NLS-1$
-				"omp_init_lock", "", Messages.OpenMPCHelpBook_init_lock, //$NON-NLS-1$ //$NON-NLS-2$
-				new FunctionPrototypeSummaryImpl("omp_init_lock", "void", //$NON-NLS-1$ //$NON-NLS-2$
-						"omp_lock_t *lock"), null)); //$NON-NLS-1$
-		funcMap.put("omp_init_nest_lock", new FunctionSummaryImpl( //$NON-NLS-1$
-				"omp_init_nest_lock", "", Messages.OpenMPCHelpBook_nest_lock, //$NON-NLS-1$ //$NON-NLS-2$
-				new FunctionPrototypeSummaryImpl("omp_init_nest_lock", "void", //$NON-NLS-1$ //$NON-NLS-2$
-						"omp_nest_lock_t *lock"), null)); //$NON-NLS-1$
-		
-		funcMap.put("omp_destroy_lock", new FunctionSummaryImpl( //$NON-NLS-1$
-				"omp_destroy_lock", "", Messages.OpenMPCHelpBook_destroy_lock, //$NON-NLS-1$ //$NON-NLS-2$ 
-				new FunctionPrototypeSummaryImpl("omp_destroy_lock", //$NON-NLS-1$
-						"void", "omp_lock_t *lock"), null)); //$NON-NLS-1$ //$NON-NLS-2$
-		funcMap.put("omp_destroy_nest_lock", new FunctionSummaryImpl( //$NON-NLS-1$
-				"omp_destroy_nest_lock", "", Messages.OpenMPCHelpBook_destroy_nest_lock, //$NON-NLS-1$ //$NON-NLS-2$
-				new FunctionPrototypeSummaryImpl("omp_destroy_nest_lock", //$NON-NLS-1$
-						"void", "omp_nest_lock_t *lock"), null)); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		funcMap.put("omp_set_lock", new FunctionSummaryImpl( //$NON-NLS-1$
-				"omp_set_lock", "", Messages.OpenMPCHelpBook_set_lock, //$NON-NLS-1$ //$NON-NLS-2$
-				new FunctionPrototypeSummaryImpl("omp_set_lock", "void", //$NON-NLS-1$ //$NON-NLS-2$
-						"omp_lock_t *lock"), null)); //$NON-NLS-1$
-		funcMap.put("omp_set_nest_lock", new FunctionSummaryImpl( //$NON-NLS-1$
-				"omp_set_nest_lock", "", Messages.OpenMPCHelpBook_set_nest_lock, //$NON-NLS-1$ //$NON-NLS-2$
-				new FunctionPrototypeSummaryImpl("omp_set_nest_lock", "void", //$NON-NLS-1$ //$NON-NLS-2$
-						"omp_nest_lock_t *lock"), null)); //$NON-NLS-1$
-		
-		funcMap.put("omp_test_lock", new FunctionSummaryImpl( //$NON-NLS-1$
-				"omp_test_lock", "", Messages.OpenMPCHelpBook_test_lock, //$NON-NLS-1$ //$NON-NLS-2$
-				new FunctionPrototypeSummaryImpl("omp_test_lock", "int", //$NON-NLS-1$ //$NON-NLS-2$
-						"omp_lock_t *lock2"), null)); //$NON-NLS-1$
-		funcMap.put("omp_test_nest_lock", new FunctionSummaryImpl( //$NON-NLS-1$
-				"omp_test_nest_lock", "", Messages.OpenMPCHelpBook_test_nest_lock, //$NON-NLS-1$ //$NON-NLS-2$
-				new FunctionPrototypeSummaryImpl("omp_test_nest_lock", "int", //$NON-NLS-1$ //$NON-NLS-2$
-						"omp_nest_lock_t *lock"), null)); //$NON-NLS-1$
-		
-		funcMap.put("omp_unset_lock", new FunctionSummaryImpl( //$NON-NLS-1$
-				"omp_unset_lock", "", Messages.OpenMPCHelpBook_unset_lock, //$NON-NLS-1$ //$NON-NLS-2$
-				new FunctionPrototypeSummaryImpl("omp_unset_lock", //$NON-NLS-1$
-						"void", "omp_lock_t *lock"), null)); //$NON-NLS-1$ //$NON-NLS-2$
-		funcMap.put("omp_unset_nest_lock", new FunctionSummaryImpl( //$NON-NLS-1$
-				"omp_unset_nest_lock", "", Messages.OpenMPCHelpBook_unset_nest_lock, //$NON-NLS-1$ //$NON-NLS-2$
-				new FunctionPrototypeSummaryImpl("omp_unset_nest_lock", //$NON-NLS-1$
-						"void", "omp_nest_lock_t *lock"), null)); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		funcMap.put("omp_get_wtime", new FunctionSummaryImpl( //$NON-NLS-1$
-				"omp_get_wtime", "", Messages.OpenMPCHelpBook_get_wtime, //$NON-NLS-1$ //$NON-NLS-2$
-				new FunctionPrototypeSummaryImpl("omp_get_wtime", "double", //$NON-NLS-1$ //$NON-NLS-2$
-						"void"), null)); //$NON-NLS-1$
-		funcMap.put("omp_get_wtick", new FunctionSummaryImpl( //$NON-NLS-1$
-				"omp_get_wtick", "", Messages.OpenMPCHelpBook_get_wtick, //$NON-NLS-1$ //$NON-NLS-2$
-				new FunctionPrototypeSummaryImpl("omp_get_wtick", "double", //$NON-NLS-1$ //$NON-NLS-2$
-						"void"), null)); //$NON-NLS-1$
-
-		// try to define constants too...
-//		funcMap.put("OMP_DYNAMIC", new FunctionSummaryImpl(
-//				"OMP_DYNAMIC", "", "OMP_DYNAMIC description",
-//				new FunctionPrototypeSummaryImpl("OMP_DYNAMIC", "ret",
-//						"int arg1, int arg2"), null));
-		
-		return funcMap;
-		}
-	
-	/** one-time generation of html docs in generateHTML() uses this value */
-	private static final String HTML_DIR = "C:\\ews\\ptpJan06\\org.eclipse.ptp.pldt.openmp.core\\html\\"; //$NON-NLS-1$
-
-	/**
-	 * generate html documents (one-time)
-	 */
-	public static void generateHTML(Map fMap) {
-		int count=0;
-		Collection fColl = fMap.values();
-		for (Iterator iter = fColl.iterator(); iter.hasNext();) {
-			FunctionSummaryImpl fsi = (FunctionSummaryImpl) iter.next();
-			IFunctionPrototypeSummary fspi = fsi.getPrototype();
-			String proto = fspi.getPrototypeString(false);
-			String args = fspi.getArguments();
-			String rt = fspi.getReturnType();
-
-			if (fsi != null) {
-				PrintStream html = null;
-				String filename=HTML_DIR+fsi.getName() + ".html"; //$NON-NLS-1$
-				try {
-					html = new PrintStream(new FileOutputStream(filename));
-					html.print("<html><head><title>"); //$NON-NLS-1$
-					html.print(fsi.getName());
-					html.println("</title>"); //$NON-NLS-1$
-					html.println("<body>"); //$NON-NLS-1$
-					html.print("<H3>"); //$NON-NLS-1$
-					html.print(fsi.getName());
-					html.println("</H3>"); //$NON-NLS-1$
-					html.println("<PRE>"); //$NON-NLS-1$
-					html.println(fspi.getPrototypeString(false));
-					html.println("</PRE>"); //$NON-NLS-1$
-					html.println("<DL><DD>"); //$NON-NLS-1$
-					html.println(fsi.getDescription());
-					html.println("<P></DL></body></html>"); //$NON-NLS-1$
-				} catch (IOException e) {
-					e.printStackTrace();
-				} finally {
-					if (html != null)
-						html.close();
-					System.out.println("wrote "+filename); //$NON-NLS-1$
-					count++;
-				}
-			}
-		}
-		System.out.println("Wrote "+count+" html files."); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	/**
-	 * Run as Java app to generate the HTML files that will be used
-	 * for F1 help.
-	 * @param args unused
-	 */
-	public static void main(String[] args) {
-		Map map = makeFunctionMap();
-		generateHTML(map);
-		
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/editorHelp/OpenMPCHelpProvider.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/editorHelp/OpenMPCHelpProvider.java
deleted file mode 100644
index abd27a2..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/editorHelp/OpenMPCHelpProvider.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005,2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.core.editorHelp;
-
-import org.eclipse.ptp.pldt.common.editorHelp.CHelpProviderImpl;
-
-/**
- * 
- * This class implements ICHelpProvider and provides OpenMP information <br>
- * (F1, hover, content assist, etc.)
- * 
- * @author tibbitts
- */
-
-public class OpenMPCHelpProvider extends CHelpProviderImpl {
-
-	public void initialize() {
-		helpBook = new OpenMPCHelpBook();
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/editorHelp/messages.properties b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/editorHelp/messages.properties
deleted file mode 100644
index 8fb4974..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/editorHelp/messages.properties
+++ /dev/null

@@ -1,23 +0,0 @@
-OpenMPCHelpBook_set_lock=Blocks the thread executing the function until the specified lock is available and then sets the lock. A simple lock is available if it is unlocked. A nestable lock is available if it is unlocked or if it is already owned by the thread executing the function.
-OpenMPCHelpBook_set_nest_lock=Blocks the thread executing the function until the specified lock is available and then sets the lock. A simple lock is available if it is unlocked. A nestable lock is available if it is unlocked or if it is already owned by the thread executing the function.
-OpenMPCHelpBook_test_lock=Attempts to set a lock but do not block execution of the thread.
-OpenMPCHelpBook_test_nest_lock=Attempts to set a lock but do not block execution of the thread.
-OpenMPCHelpBook_unset_lock=Provides the means of releasing ownership of a lock.
-OpenMPCHelpBook_unset_nest_lock=Provides the means of releasing ownership of a lock.
-OpenMPCHelpBook_get_wtime=Returns the time elapsed from a fixed starting time. The value of the fixed starting time is determined at the start of the current program, and remains constant throughout program execution.
-OpenMPCHelpBook_get_wtick=Returns the number of seconds between clock ticks.
-OpenMPCHelpBook_init_lock=These functions (this and omp_init_nest_lock) provide the only means of initializing a lock. Each function initializes the lock associated with the parameter lock for use in subsequent calls.
-OpenMPCHelpBook_nest_lock=These functions (this and omp_init_lock) provide the only means of initializing a lock. Each function initializes the lock associated with the parameter lock for use in subsequent calls.
-OpenMPCHelpBook_destroy_nest_lock=Ensures that the specified lock variable lock is uninitialized.
-OpenMPCHelpBook_destroy_lock=Ensures that the specified lock variable lock is uninitialized.
-OpenMPCHelpBook_get_dynamic=This function returns non-zero if dynamic thread adjustments enabled and returns 0 otherwise.
-OpenMPCHelpBook_get_max_threads=This function returns the maximum value that can be returned by calls to omp_get_num_threads.
-OpenMPCHelpBook_get_nested=This function returns non-zero if nested parallelism is enabled and 0 if it is disabled.
-OpenMPCHelpBook_get_num_procs=This function returns the maximum number of processors that could be assigned to the program.
-OpenMPCHelpBook_get_num_threads=This function returns the number of threads currently in the team executing the parallel region from which it is called.
-OpenMPCHelpBook_get_thread_num=This function returns the thread number, within its team, of the thread executing the function. The thread number lies between 0 and omp_get_num_threads()-1, inclusive. The master thread of the team is thread 0.
-OpenMPCHelpBook_in_parallel=This function returns non-zero if it is called within the dynamic extent of a parallel region executing in parallel; otherwise, it returns 0.
-OpenMPCHelpBook_omp_c_and_fortran_help_book_title=OpenMP C and Fortran Help Book
-OpenMPCHelpBook_set_dynamic=This function enables or disables dynamic adjustment of the number of threads available for execution of parallel regions.
-OpenMPCHelpBook_set_nested=This function enables or disables nested parallelism.
-OpenMPCHelpBook_set_num_threads=Sets the number of threads that will be used in the next parallel region

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/messages/Messages.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/messages/Messages.java
deleted file mode 100644
index 14120f7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/messages/Messages.java
+++ /dev/null

@@ -1,40 +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.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.pldt.openmp.core.messages.messages"; //$NON-NLS-1$
-	public static String OpenMPArtifactView_Construct;
-	public static String OpenMPArtifactView_noArtifactSelected;
-	public static String OpenMPArtifactView_noSelection;
-	public static String OpenMPArtifactView_OpenMP_Artifact;
-	public static String OpenMPArtifactView_OpenMP_Artifacts;
-	public static String OpenMPArtifactView_showPragmaRegion;
-	public static String OpenMPArtifactView_showRegionForSelected;
-	public static String OpenMPCASTVisitor_OpenMP_Call;
-	public static String OpenMPCASTVisitor_OpenMP_Constant;
-	public static String OpenMPIDs_OpenMP_includes;
-	public static String OpenMPPlugin_OpenMP_includes;
-	public static String OpenMPPreferencePage_OpenMP_include_paths;
-	public static String OpenMPPreferencePage_PleaseChooseAdirForOpenMPincludes;
-	public static String OpenMPPreferencePage_recognizeAPISByPrefixAlone;
-	public static String RunAnalyseOpenMPcommandHandler_OpenMP_directive;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/messages/messages.properties b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/messages/messages.properties
deleted file mode 100644
index 97776a7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/messages/messages.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-OpenMPArtifactView_noArtifactSelected=No artifact selected
-OpenMPArtifactView_noSelection=No selection
-OpenMPArtifactView_OpenMP_Artifact=OpenMP Artifact
-OpenMPArtifactView_OpenMP_Artifacts=OpenMP Artifacts
-OpenMPArtifactView_showPragmaRegion=Show pragma region
-OpenMPArtifactView_showRegionForSelected=Show region for selected 
-OpenMPArtifactView_Construct=Construct
-
-OpenMPCASTVisitor_OpenMP_Call=OpenMP Call
-OpenMPCASTVisitor_OpenMP_Constant=OpenMP Constant
-
-OpenMPIDs_OpenMP_includes=OpenMP Includes
-
-OpenMPPlugin_OpenMP_includes=OpenMP Includes
-
-RunAnalyseOpenMPcommandHandler_OpenMP_directive=OpenMP directive
-
-OpenMPPreferencePage_OpenMP_include_paths=OpenMP include paths:
-OpenMPPreferencePage_PleaseChooseAdirForOpenMPincludes=Please choose a directory for OpenMP includes:
-OpenMPPreferencePage_recognizeAPISByPrefixAlone=Recognize OpenMP Artifacts by prefix (omp_) alone?

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/prefs/OpenMPPreferenceInitializer.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/prefs/OpenMPPreferenceInitializer.java
deleted file mode 100644
index ff1328e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/prefs/OpenMPPreferenceInitializer.java
+++ /dev/null

@@ -1,34 +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.openmp.core.prefs;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ptp.pldt.openmp.internal.core.OpenMPIDs;
-import org.eclipse.ptp.pldt.openmp.core.OpenMPPlugin;
-
-/**
- * Class used to initialize default preference values.
- * @autho Beth Tibbitts
- */
-public class OpenMPPreferenceInitializer extends AbstractPreferenceInitializer {
-
-	/**
-	 * Initialize default OpenMP preferences
-	 */
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = OpenMPPlugin.getDefault()
-				.getPreferenceStore();
-    	store.setDefault(OpenMPIDs.OpenMP_BUILD_CMD, "gcc -fopenmp"); //$NON-NLS-1$
-    	store.setDefault(OpenMPIDs.OPENMP_RECOGNIZE_APIS_BY_PREFIX_ALONE, true);
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/prefs/OpenMPPreferencePage.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/prefs/OpenMPPreferencePage.java
deleted file mode 100644
index 089abd0..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/prefs/OpenMPPreferencePage.java
+++ /dev/null

@@ -1,83 +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.openmp.core.prefs;
-
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PathEditor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.pldt.openmp.internal.core.OpenMPIDs;
-import org.eclipse.ptp.pldt.openmp.core.OpenMPPlugin;
-import org.eclipse.ptp.pldt.openmp.core.messages.Messages;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-/**
- * Preference page based on FieldEditorPreferencePage
- * 
- */
-
-public class OpenMPPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage
-{
-    private static final String INCLUDES_PREFERENCE_LABEL  = Messages.OpenMPPreferencePage_OpenMP_include_paths;
-    private static final String INCLUDES_PREFERENCE_BROWSE = Messages.OpenMPPreferencePage_PleaseChooseAdirForOpenMPincludes;
-    private static final String OPENMP_RECOGNIZE_APIS_BY_PREFIX_ALONE_LABEL = Messages.OpenMPPreferencePage_recognizeAPISByPrefixAlone; //$NON-NLS-1$
-
-    
-    public OpenMPPreferencePage()
-    {
-        super(GRID);
-        initPreferenceStore();
-    }
-
-    public OpenMPPreferencePage(int style)
-    {
-        super(style);
-        initPreferenceStore();
-    }
-
-    public OpenMPPreferencePage(String title, ImageDescriptor image, int style)
-    {
-        super(title, image, style);
-        initPreferenceStore();
-    }
-
-    public OpenMPPreferencePage(String title, int style)
-    {
-        super(title, style);
-        initPreferenceStore();
-    }
-
-    /**
-     * Init preference store and set the preference store for the preference page
-     */
-    private void initPreferenceStore()
-    {
-        IPreferenceStore store = OpenMPPlugin.getDefault().getPreferenceStore();
-        setPreferenceStore(store);
-    }
-
-    public void init(IWorkbench workbench)
-    {
-    }
-
-    protected void createFieldEditors()
-    {
-    	 
-    	 BooleanFieldEditor bPrefix = new BooleanFieldEditor(OpenMPIDs.OPENMP_RECOGNIZE_APIS_BY_PREFIX_ALONE, OPENMP_RECOGNIZE_APIS_BY_PREFIX_ALONE_LABEL, getFieldEditorParent());
-         addField(bPrefix);
-         
-        PathEditor pathEditor = new PathEditor(OpenMPPlugin.OPEN_MP_INCLUDES, INCLUDES_PREFERENCE_LABEL,
-                INCLUDES_PREFERENCE_BROWSE, getFieldEditorParent());
-        addField(pathEditor);
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/views/OpenMPArtifactView.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/views/OpenMPArtifactView.java
deleted file mode 100644
index 0470e61..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/core/views/OpenMPArtifactView.java
+++ /dev/null

@@ -1,164 +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.core.views;
-
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.model.CModelException;
-import org.eclipse.cdt.core.parser.ParserUtil;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-import org.eclipse.cdt.internal.ui.util.EditorUtility;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ptp.pldt.common.Artifact;
-import org.eclipse.ptp.pldt.common.ArtifactManager;
-import org.eclipse.ptp.pldt.common.views.SimpleTableMarkerView;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTOMPPragma;
-import org.eclipse.ptp.pldt.openmp.core.OpenMPPlugin;
-import org.eclipse.ptp.pldt.openmp.core.messages.Messages;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.AbstractTextEditor;
-
-/**
- * An OpenMP artifact view based on SimpleTableView <br>
- * Note that the ID must be unique.
- * 
- */
-public class OpenMPArtifactView extends SimpleTableMarkerView {
-
-	public OpenMPArtifactView() {
-		// if you need to read icon images, etc. from the plug-in, be sure to
-		// pass in an actual Plugin class instance for first arg
-		// super(OpenMPPlugin.getDefault(), "OpenMP Artifact", "OpenMP Artifacts", "Construct", OpenMPPlugin.MARKER_ID);
-		super(
-				OpenMPPlugin.getDefault(),
-				Messages.OpenMPArtifactView_OpenMP_Artifact,  
-				Messages.OpenMPArtifactView_OpenMP_Artifacts, 
-				Messages.OpenMPArtifactView_Construct,
-				OpenMPPlugin.MARKER_ID);
-
-	}
-
-
-	/**
-	 * Provide custom info for filling in the last column
-	 */
-	protected String getConstructStr(IMarker marker) throws CoreException {
-		Integer temp = (Integer) marker.getAttribute(columnID_);
-		if (temp != null) {
-			Integer constructType = (Integer) temp;
-			int i = constructType.intValue();
-			String val="";  //$NON-NLS-1$
-			if (i < Artifact.CONSTRUCT_TYPE_NAMES.length)
-				val = Artifact.CONSTRUCT_TYPE_NAMES[i];
-			else
-				val = "value is " + i; //$NON-NLS-1$
-		
-			/*
-			val = "value is " + i; // BRT need a more robust lookup
-			if (i == 0)
-				val = "OpenMP Pragma";
-			if (i == 1)
-				val = "Function Call";
-	*/
-			return val;
-		} else
-			return " "; //$NON-NLS-1$
-	}
-    
-
-    /**
-     * Make "show info" action to display artifact information
-     * This is the "show pragma region" action for OpenMP artifacts
-     */
-    protected void makeShowInfoAction()
-    {
-        infoAction = new Action() {
-
-            /* (non-Javadoc)
-             * @see org.eclipse.jface.action.IAction#run()
-             */
-            @SuppressWarnings("restriction")
-            public void run()
-            {
-                ISelection selection = viewer.getSelection();
-                Object obj = ((IStructuredSelection) selection).getFirstElement();
-                IMarker marker = (IMarker) obj;
-                if(marker==null){
-                	MessageDialog.openInformation(null, org.eclipse.ptp.pldt.openmp.core.messages.Messages.OpenMPArtifactView_noSelection,   
-                			org.eclipse.ptp.pldt.openmp.core.messages.Messages.OpenMPArtifactView_noArtifactSelected); 
-                	return;
-                }
-
-                try {
-                    //Object o = artifactManager_.getArtifact((String)marker.getAttribute(IDs.ID));
-                    Object o = ArtifactManager.getArtifact(marker);
-                    if (o==null || !(o instanceof Artifact))  return;
-                    Artifact artifact = (Artifact)o;
-                    Object p = artifact.getArtifactAssist();
-                    if (p==null || !(p instanceof PASTOMPPragma))  return;
-                    PASTOMPPragma ompPragma = (PASTOMPPragma)p;
-                    IASTNode      iRegion    = ompPragma.getRegion();
-                    ASTNode       region     = (iRegion instanceof ASTNode ? (ASTNode)iRegion : null);
-                    if (region==null)  return;
-                    
-                    // determine if we collected location information for this omp pragma
-                    String filename = ompPragma.getRegionFilename(); //region.getContainingFilename(); 
-                    if (filename==null)  return;
-                    
-                    IResource r = ParserUtil.getResourceForFilename(filename);
-                    
-                    IEditorPart aPart = null;
-                    if (r!=null) {
-                        try{
-                            aPart = EditorUtility.openInEditor(r);
-                        }
-                        catch(PartInitException pie) { return; }
-                        catch(CModelException e)     { return; }
-                    }
-                    else {
-                        return;
-                    }
-                    
-                    if (aPart instanceof AbstractTextEditor) 
-                    {
-                        int offset = ompPragma.getRegionOffset(); //ifl.getNodeOffset();  //locs[0].getNodeOffset();
-                        int length = ompPragma.getRegionLength(); //ifl.getNodeLength();  //region.getLength(); 
-                        //System.out.println("OMPAV: Pragma offset: "+offset+" length: "+length);
-                        ((AbstractTextEditor)aPart).selectAndReveal( offset, length);
-                    }  
-                     
-                    
-                } catch (Exception e) {
-                    System.out.println("ATV.doubleclickAction: Error positioning editor page from marker line number"); //$NON-NLS-1$
-                    //showStatusMessage("Error positioning editor from marker line number", "error marker goto");
-                    e.printStackTrace();
-                }
-                 
-            }
-        };
-
-        infoAction.setText(Messages.OpenMPArtifactView_showPragmaRegion);   
-        infoAction.setToolTipText(Messages.OpenMPArtifactView_showRegionForSelected + thingname_); 
-        infoAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(
-                ISharedImages.IMG_OBJS_INFO_TSK));
-
-    }
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/internal/core/OpenMPIDs.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/internal/core/OpenMPIDs.java
deleted file mode 100644
index 8fd0096..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.core/src/org/eclipse/ptp/pldt/openmp/internal/core/OpenMPIDs.java
+++ /dev/null

@@ -1,26 +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.openmp.internal.core;
-
-import org.eclipse.ptp.pldt.openmp.core.messages.Messages;
-
-/**
- * @author Beth Tibbitts
- *
- */
-public class OpenMPIDs {
- 
-	public static final String OpenMP_INCLUDES = Messages.OpenMPIDs_OpenMP_includes;
-	// FIXME the following is used as a key?
-	public static final String OpenMP_BUILD_CMD = "gcc -fopenmp"; //$NON-NLS-1$
-	public static final String OPENMP_RECOGNIZE_APIS_BY_PREFIX_ALONE = "openmpRecognizeAPIsByPrefixAlone";//$NON-NLS-1$
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/.classpath b/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/.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.ui.pv/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/.cvsignore
deleted file mode 100644
index 47e3103..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-@dot

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/.project b/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/.project
deleted file mode 100644
index 2718570..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.openmp.ui.pv</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.ui.pv/.settings/org.eclipse.jdt.core.prefs b/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1eb8ac7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,8 +0,0 @@
-#Fri Apr 16 12:52:42 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.ui.pv/META-INF/MANIFEST.MF b/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/META-INF/MANIFEST.MF
deleted file mode 100644
index 47bd65b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.pldt.openmp.ui.pv; singleton:=true
-Bundle-Version: 4.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.pldt.openmp.ui.pv.PvPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.cdt,
- org.eclipse.cdt.ui,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ptp.pldt.openmp.analysis,
- org.eclipse.cdt.core,
- org.eclipse.ui.ide,
- org.eclipse.ptp.pldt.common
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.ptp.pldt.openmp.ui.pv,
- org.eclipse.ptp.pldt.openmp.ui.pv.views
-Bundle-ClassPath: .
-Bundle-Vendor: %pluginProvider
-Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/about.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/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.ui.pv/build.properties b/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/build.properties
deleted file mode 100644
index 23d6cb6..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/build.properties
+++ /dev/null

@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               icons/,\
-               plugin.properties,\
-               about.html

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/icons/openMPproblem.gif b/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/icons/openMPproblem.gif
deleted file mode 100644
index 16bdc3f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/icons/openMPproblem.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/plugin.properties b/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/plugin.properties
deleted file mode 100644
index 6476608..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/plugin.properties
+++ /dev/null

@@ -1,14 +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 Parallel Language Development Tools OpenMP Problems View
-pluginProvider=Eclipse.org
-
-view.name = OpenMP Problems
-extension.name = OpenMP Problem Marker
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/plugin.xml b/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/plugin.xml
deleted file mode 100644
index 202dc55..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/plugin.xml
+++ /dev/null

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-   <extension
-         point="org.eclipse.ui.views">
-      <view
-            name="%view.name"
-            icon="icons/openMPproblem.gif"
-            category="org.eclipse.ptp.ui.views" 
-            class="org.eclipse.ptp.pldt.openmp.ui.pv.views.OpenMPProblemsView"
-            id="org.eclipse.ptp.pldt.openmp.ui.pv.views.OpenMPProblemsView">
-      </view>
-   </extension>
-   <!--  openMP markers -->
-   <!-- MARKER_ID       = "org.eclipse.ptp.pldt.openmp.ui.pv.openMPProblemMarker" -->
-   <extension point="org.eclipse.core.resources.markers"
-		id="openMPProblemMarker"
-        name="%extension.name">
-      <super type="org.eclipse.core.resources.textmarker"/>
-      <attribute name="description"/>
-      <attribute name="resource"/>
-      <attribute name="infoldername"/>
-      <attribute name="location"/>
-      <attribute name="problem"/>
-   </extension>
-
-</plugin>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/PvPlugin.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/PvPlugin.java
deleted file mode 100644
index 12a4783..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/PvPlugin.java
+++ /dev/null

@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corp. 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corp. - initial implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.ui.pv;
-
-import org.eclipse.ui.plugin.*;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class PvPlugin extends AbstractUIPlugin {
-
-	//The shared instance.
-	private static PvPlugin plugin;
-    
-    public static final String MARKER_ID       = "org.eclipse.ptp.pldt.openmp.ui.pv.openMPProblemMarker"; //$NON-NLS-1$
-    
-    public static final String VIEW_ID         = "org.eclipse.ptp.pldt.openmp.ui.pv.views.OpenMPProblemsView"; //$NON-NLS-1$
-	
-	/**
-	 * The constructor.
-	 */
-	public PvPlugin() {
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static PvPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.ptp.pldt.openmp.ui.pv", path); //$NON-NLS-1$
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/messages/Messages.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/messages/Messages.java
deleted file mode 100644
index 67c2a69..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/messages/Messages.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corp. 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corp. - initial implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.ui.pv.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.pldt.openmp.ui.pv.messages.messages"; //$NON-NLS-1$
-	public static String OpenMPProblemsView_action1;
-	public static String OpenMPProblemsView_action1executed;
-	public static String OpenMPProblemsView_action1tooltip;
-	public static String OpenMPProblemsView_Description;
-	public static String OpenMPProblemsView_InFolder;
-	public static String OpenMPProblemsView_Location;
-	public static String OpenMPProblemsView_removeAllMarkers;
-	public static String OpenMPProblemsView_removeMarkers;
-	public static String OpenMPProblemsView_Resource;
-	public static String OpenMPProblemsView_SampleView;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/messages/messages.properties b/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/messages/messages.properties
deleted file mode 100644
index d80c2d7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/messages/messages.properties
+++ /dev/null

@@ -1,10 +0,0 @@
-OpenMPProblemsView_action1=Action 1
-OpenMPProblemsView_action1executed=Action 1 executed
-OpenMPProblemsView_action1tooltip=Action 1 tooltip
-OpenMPProblemsView_Description=Description
-OpenMPProblemsView_InFolder=In Folder
-OpenMPProblemsView_Location=Location
-OpenMPProblemsView_removeAllMarkers=Remove all markers
-OpenMPProblemsView_removeMarkers=Remove Markers
-OpenMPProblemsView_Resource=Resource
-OpenMPProblemsView_SampleView=Sample View

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/views/OpenMPProblemsView.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/views/OpenMPProblemsView.java
deleted file mode 100644
index a0eee4a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/views/OpenMPProblemsView.java
+++ /dev/null

@@ -1,557 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006,2010 IBM Corp. 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corp. - initial implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.ui.pv.views;
-
-
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.eclipse.ptp.pldt.openmp.analysis.OpenMPError;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.*;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.*;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.jface.action.*;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.ui.*;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.SWT;
-
-import org.eclipse.cdt.core.parser.ParserUtil;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IMarkerDelta;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.ptp.pldt.openmp.ui.pv.PvPlugin;
-import org.eclipse.ptp.pldt.openmp.ui.pv.messages.Messages;
-import org.eclipse.ptp.pldt.openmp.ui.pv.views.ProblemMarkerAttrIds;
-
-/**
- * OpenMP Problems View
- * <p>
- */
-
-public class OpenMPProblemsView extends ViewPart {
-	private TableViewer viewer;
-	private Action action1;
-	//private Action action2;
-	private Action doubleClickAction;
-	private Action removeMarkerAction;
-    
-    private   String                  markerID_   = PvPlugin.MARKER_ID;
-    protected UpdateVisitor           visitor_    = new UpdateVisitor();
-    
-    private String                    iconName_          = "icons/openMPproblem.gif"; //$NON-NLS-1$
-    private AbstractUIPlugin          thePlugin_;
-    
-    protected boolean                 traceOn     = false;
-    
-    private static final String [] columns_ = {" ", //$NON-NLS-1$
-                                               Messages.OpenMPProblemsView_Description,
-                                               Messages.OpenMPProblemsView_Resource,
-                                               Messages.OpenMPProblemsView_InFolder,
-                                               Messages.OpenMPProblemsView_Location
-    };
-
-    /**
-     * OpenMPProblemsView - Constructor
-     *
-     */
-    public OpenMPProblemsView() {
-        thePlugin_ = PvPlugin.getDefault(); 
-    }
-
-    /**
-     * This is a callback that will allow us
-     * to create the viewer and initialize it.
-     */
-    public void createPartControl(Composite parent) {
-        Table       table  = new Table(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION);
-        TableLayout layout = new TableLayout();
-        table.setLayout(layout);
-        table.setLinesVisible(true);
-        table.setHeaderVisible(true);
-        
-        for(int i=0; i<columns_.length; i++) {
-            layout.addColumnData(new ColumnWeightData(columns_[i].length(), columns_[i].length(), true));
-            TableColumn tc = new TableColumn(table, SWT.NONE);
-            tc.setText(columns_[i]);
-            tc.setAlignment(SWT.LEFT);
-            tc.setResizable(true);
-        }
-         
-        viewer = new TableViewer(table); //new TableViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION);
-        viewer.setContentProvider(new ViewContentProvider());
-        viewer.setLabelProvider(new ViewLabelProvider());
-        viewer.setSorter(new NameSorter());
-        viewer.setInput(ResourcesPlugin.getWorkspace().getRoot());
-        // markers from workspace
-        
-        makeActions();
-        hookContextMenu();
-        hookDoubleClickAction();
-        contributeToActionBars();
-    }
-   
-
-    /**
-     * It might be useful for subclasses to override this, to say which filenames should allow the action "run analysis"  to create
-     * new artifacts and thus new markers. <br>
-     * This is a default implementation
-     * 
-     * @param filename
-     * @return
-     */
-    public boolean validForAnalysis(String filename)
-    {
-        //return MpiUtil.validForAnalysis(filename);
-        return true;
-
-    }
-
-
-	/*
-	 * The content provider class is responsible for providing objects to the view. It can wrap
-	 * existing objects in adapters or simply return objects as-is. These objects may be sensitive
-	 * to the current input of the view, or ignore it and always show the same content 
-	 * (like Task List, for example).
-	 */
-	class ViewContentProvider implements IStructuredContentProvider, IResourceChangeListener {
-        private IResource    input         = null;
-        private boolean      hasRegistered = false;
-        
-		public void inputChanged(Viewer v, Object oldInput, Object newInput) {
-              if (!hasRegistered) {
-                  // add me as a resource change listener so i can refresh at
-                  // least when markers are changed
-                  ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
-                  hasRegistered = true;
-              }
-              if (newInput instanceof IResource)
-                  input = (IResource)newInput;
-		}
-        
-		public void dispose() {
-            ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-		}
-        
-		public Object[] getElements(Object parent) 
-        {
-            Object [] objs = null;
-            try {
-                String id = markerID_;
-                if (input!=null) {
-                     // use the cached input object instead of querying from workspace
-                     objs = input.findMarkers(id, false, IResource.DEPTH_INFINITE);
-                }
-            }
-            catch(CoreException e) {
-                System.out.println("OpenMPProblemsView exception gettting model elements (markers"); //$NON-NLS-1$
-                e.printStackTrace();
-            }
-            return objs;
-		}
-        
-        /**
-         *  resourceChanged - react to a resource change event
-         */
-        public void resourceChanged(IResourceChangeEvent event)
-        {
-            final IResourceDelta delta = event.getDelta();
-            Control              ctrl  = viewer.getControl();
-            if (ctrl!=null && !ctrl.isDisposed()) {
-                ctrl.getDisplay().syncExec(new Runnable()  {
-                    public void run() 
-                    {
-                        processResourceChangeDelta(delta);
-                        // we should have updated the indiv. rows we care about.
-                        // but need this for Marker display after initial analysis,
-                        // and for markers deleted, etc.  Can remove when we more completely
-                        // handle things in processResourceChangeDelta
-                        viewer.refresh();
-                    }
-                });
-            }
-        }
-        
-        protected void processResourceChangeDelta(IResourceDelta delta)
-        {
-            try {
-                delta.accept(visitor_);
-            }
-            catch(CoreException e) {
-                System.out.println("OpenMPProblemsView error in processResoruceChangeDelta"); //$NON-NLS-1$
-                e.printStackTrace();
-            }
-        }
-	}
-	class ViewLabelProvider extends LabelProvider implements ITableLabelProvider {
-        private HashMap   iconHash = new HashMap();
-        
-        public Image getColumnImage(Object obj, int index)
-        {
-            // we only put image icon in the first column
-            switch (index) {
-                case 0:
-                    return getCustomImage(obj);
-                default:
-                    return null;
-            }
-        }
-        protected Image getCustomImage(Object obj)
-        {
-            // if we've already created one of this type of icon, reuse it.
-            Image img = (Image) iconHash.get(iconName_);
-            if (img == null) {
-                Path path= new Path(iconName_);
-                // BRT make sure the specific plugin is being used here to find its OWN icons
-                URL url = thePlugin_.find(path);
-                ImageDescriptor id = ImageDescriptor.createFromURL(url);
-                img = id.createImage();
-                if (traceOn) System.out.println("ATV: ***** created image for " + iconName_); //$NON-NLS-1$
-                iconHash.put(iconName_, img);// save for reuse
-            }
-            return img;
-        }
-        
-        public void dispose()
-        {
-            if (traceOn) System.out.println("ATV.ViewLabelProvider.dispose(); dispose of icon images"); //$NON-NLS-1$
-            for (Iterator iter = iconHash.values().iterator(); iter.hasNext();) {
-                Image img = (Image) iter.next();
-                img.dispose();
-            }
-            super.dispose();
-        }
-
-
-        /**
-         * Determine the text to go in each column
-         * 
-         * @param obj the Marker (we hope) that goes on the current row
-         * @param index the column number in the table
-         * 
-         */
-        public String getColumnText(Object obj, int index)
-        {
-            if (obj == null) {
-                System.out.println("ATV: LabelProv obj is null; index=" + index); //$NON-NLS-1$
-                return "ATV obj null"; //$NON-NLS-1$
-            }
-            IMarker marker = (IMarker) obj;
-            try {
-                switch (index) {
-                    case 0:
-                        return ""; //$NON-NLS-1$
-                    case 1:
-                        String id = (String) marker.getAttribute(ProblemMarkerAttrIds.DESCRIPTION);
-                        return id;
-                    case 2:
-                        return (String) marker.getAttribute(ProblemMarkerAttrIds.RESOURCE);
-                    case 3:
-                        return (String) marker.getAttribute(ProblemMarkerAttrIds.INFOLDER);
-                    case 4:
-                        return ((Integer) marker.getAttribute((ProblemMarkerAttrIds.LOCATION))).toString();
-                    default:
-                        return ""; //$NON-NLS-1$
-                }
-            } catch (CoreException ce) {
-                return ("ViewLabelProvider.getColumnText error: "+ce); //$NON-NLS-1$
-            }
-        }
-
-	}
-	class NameSorter extends ViewerSorter {
-	}
-
-	private void hookContextMenu() {
-		MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager manager) {
-				OpenMPProblemsView.this.fillContextMenu(manager);
-			}
-		});
-		Menu menu = menuMgr.createContextMenu(viewer.getControl());
-		viewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(menuMgr, viewer);
-	}
-
-	private void contributeToActionBars() {
-		IActionBars bars = getViewSite().getActionBars();
-		fillLocalPullDown(bars.getMenuManager());
-		fillLocalToolBar(bars.getToolBarManager());
-	}
-
-	private void fillLocalPullDown(IMenuManager manager) {
-		manager.add(action1);
-		manager.add(new Separator());
-		//manager.add(action2);
-	}
-
-	private void fillContextMenu(IMenuManager manager) {
-		manager.add(action1);
-		//manager.add(action2);
-		// Other plug-ins can contribute there actions here
-		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-	}
-	
-	private void fillLocalToolBar(IToolBarManager manager) {
-		manager.add(action1);
-		manager.add(removeMarkerAction);
-
-	}
-
-	private void makeActions() {
-        //makeShowInfoAction();
-		action1 = new Action() {
-			public void run() {
-				showMessage(Messages.OpenMPProblemsView_action1executed);
-			}
-		};
-		action1.setText(Messages.OpenMPProblemsView_action1);
-		action1.setToolTipText(Messages.OpenMPProblemsView_action1tooltip);
-		action1.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().
-			getImageDescriptor(ISharedImages.IMG_OBJS_INFO_TSK));
-        
-        doubleClickAction = new GotoLineAction(this, viewer);
-        makeRemoveMarkerAction();
-	}
-
-	private void hookDoubleClickAction() {
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				doubleClickAction.run();
-			}
-		});
-	}
-	/**
-	 * Make "remove marker" action to display artifact information
-	 */
-	protected void makeRemoveMarkerAction() {
-		removeMarkerAction = new Action() {
-			public void run() {
-				// batch changes so we get only one resource change event
-				final IWorkspaceRoot wsResource = ResourcesPlugin.getWorkspace().getRoot();
-				
-				IWorkspaceRunnable runnable = new IWorkspaceRunnable(){
-					public void run(IProgressMonitor monitor) throws CoreException {
-					try {
-						int depth = IResource.DEPTH_INFINITE;
-						wsResource.deleteMarkers(markerID_,false,depth);
-						if(traceOn)
-							System.out.println("markers removed id="+markerID_); //$NON-NLS-1$
-					} catch (CoreException e) {
-						System.out.println("RM: exception deleting markers."); //$NON-NLS-1$
-						// e.printStackTrace();
-					}
-					}};
-					try {
-						runnable.run(null);
-					} catch (CoreException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-
-				 
-			}//end run()
-		};// end new action
-		removeMarkerAction.setText(Messages.OpenMPProblemsView_removeMarkers);
-		removeMarkerAction.setToolTipText(Messages.OpenMPProblemsView_removeAllMarkers);
-		removeMarkerAction.setImageDescriptor(PlatformUI.getWorkbench()
-				.getSharedImages().getImageDescriptor(
-						ISharedImages.IMG_TOOL_DELETE));// nice "red X" image
-
-	}
-	private void showMessage(String message) {
-		MessageDialog.openInformation(
-			viewer.getControl().getShell(),
-			Messages.OpenMPProblemsView_SampleView,
-			message);
-	}
-
-	/**
-	 * Passing the focus request to the viewer's control.
-	 */
-	public void setFocus() {
-		viewer.getControl().setFocus();
-	}
-    
-
-    /**
-     * Visit the resource delta to look for the marker changes we are interested in
-     * 
-     * @author Beth Tibbitts
-     */
-    public class UpdateVisitor implements IResourceDeltaVisitor
-    {
-
-        /**
-         * Visit appropriate parts of the resource delta to find the markers that changed that we care about.
-         * 
-         * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
-         */
-        public boolean visit(IResourceDelta delta) throws CoreException
-        {
-            IResource resource = delta.getResource();
-            //String name = resource.getName();
-            if (resource.getType() == IResource.FILE) {
-                if (delta.getKind() == IResourceDelta.CHANGED) {
-                    //if (traceOn) System.out.println("UpdateVisitor: file changed: " + name);
-
-                    // Handle file changes (saves) by reporting the changes
-                    // made to the file, to update backend analysis
-                    // representation
-                    IFile f = (IFile) resource;
-                    int flags = delta.getFlags();
-                    int contentChanged = flags & IResourceDelta.CONTENT;
-
-                    if (validForAnalysis(f.getName())) {
-                        if (traceOn)
-                            System.out.println("File " + f.getName() + " is valid for analysis so will process the change..."); //$NON-NLS-1$ //$NON-NLS-2$
-                        if (contentChanged != 0) {
-                            // do we need to tell back end (analysis engine) that file changed?
-                        }
-
-                        // refresh markers for that file?
-                        IMarkerDelta[] mDeltas = delta.getMarkerDeltas();
-                        int len = mDeltas.length;
-                        for (int j = 0; j < len; j++) {
-                            IMarkerDelta delta3 = mDeltas[j];
-                            if (traceOn) showMarkerDeltaKind(delta3);
-                            IMarker m = delta3.getMarker();
-                            String ln = IMarker.LINE_NUMBER;
-                            if (traceOn) System.out.println("---UpdateVisitor.visit():viewer update marker: (lineNo)"); //$NON-NLS-1$
-                            // showMarker(m);
-                            String[] props = new String[1]; // awkward. why???
-                            props[0] = ln;
-                            // just update viewer item, not the whole view
-                            // viewer.refresh();
-                            viewer.update(m, props);
-                        } // end loop
-                    } else {
-                        if (traceOn)
-                            System.out.println("File " + f.getName() + " is NOT valid for analysis so will ignore change..."); //$NON-NLS-1$ //$NON-NLS-2$
-
-                    }
-                } // end if CHANGED
-                else if (delta.getKind() == IResourceDelta.ADDED) {
-                    //System.out.println("Resource added.");
-                    checkMarkerDeltas(delta);
-                } else if (delta.getKind() == IResourceDelta.REPLACED) {
-                    //System.out.println("Resource replaced.");
-                    checkMarkerDeltas(delta);
-                } else if (delta.getKind() == IResourceDelta.REMOVED) {
-                    //System.out.println("Resource removed.");
-                    checkMarkerDeltas(delta);
-                }
-            } // end if FILE
-            return true; // keep going
-        }
-
-        private void checkMarkerDeltas(IResourceDelta delta)
-        {
-            IMarkerDelta[] md1 = delta.getMarkerDeltas();
-            int len = md1.length;
-            //System.out.println("       ... found " + len + " markerDeltas.");
-        }
-
-        /**
-         * Show info about the marker in the marker delta. This is just tracing the info available until we do something
-         * with it. For now, we're just doing a (big) viewer.refresh() to refresh all the markers. When we get more
-         * intelligent about just updating the ones that changed, we can remove that. Shouldn't make much different for
-         * small sets of markers, but for many markers, this could be a significant performance improvement.
-         * 
-         * @param delta3
-         */
-        private void showMarkerDeltaKind(IMarkerDelta delta3)
-        {
-
-            String mid = "", ml = "", mlpi = ""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            try {
-                // note: we're getting marker deltas on ALL markers,
-                // not just artifact markers, which can throw us off.
-                // in particular, temp markers used by actions?
-
-                //mid = m.getAttribute(uniqueID_).toString();
-                //ml = m.getAttribute(IMarker.LINE_NUMBER).toString();
-                //mlpi = m.getAttribute(IDs.LINE).toString();
-            } catch (Exception e1) {
-                // ignore errors; only tracing for now.
-                System.out.println("ATV.UpdateVisitor error getting marker info "); //$NON-NLS-1$
-                e1.printStackTrace();
-            }
-            if (traceOn) System.out.println("    markerID_=" + mid + "  lineNo(mkr-mpiA)=" + ml + "-" + mlpi); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        }
-
-    } // end class UpdateVisitor
-    
-    
-    // Action for dblclick and go to line
-    public static class GotoLineAction extends Action
-    {
-        protected   ViewPart   viewPart_ = null;
-        protected   Viewer     viewer_   = null;
-        
-        public GotoLineAction(ViewPart viewPart, Viewer viewer)
-        {
-            viewPart_ = viewPart;
-            viewer_   = viewer;
-        }
-        
-        public void run()
-        {
-            ISelection selection = viewer_.getSelection();
-            Object obj = ((IStructuredSelection)selection).getFirstElement();
-            IMarker marker = (IMarker) obj;
-            try {
-                OpenMPError error = (OpenMPError)marker.getAttribute(ProblemMarkerAttrIds.PROBLEMOBJECT);
-                if (error==null) return;
-                String filename = error.getPath()+"/"+error.getFilename();  //$NON-NLS-1$
-                
-                IResource r = ParserUtil.getResourceForFilename(filename);
-                IFile     f = (r instanceof IFile ? (IFile)r : null);
-                if (f==null)  return;
-                // IFile fakefile = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(new Path(fqstr));
-                
-                IWorkbenchPage wbp = viewPart_.getSite().getPage();
-                IEditorPart editor = IDE.openEditor(wbp, f);
-                String      markerID = "org.eclipse.core.resource.textmarker"; //$NON-NLS-1$
-                IMarker     marker1 = f.createMarker(markerID);
-                marker1.setAttribute(IMarker.LINE_NUMBER, error.getLineno());
-                marker1.setAttribute(IMarker.LOCATION, filename);
-                  
-                IDE.gotoMarker(editor, marker1);
-                marker1.delete();
-            }
-            catch(Exception e) {e.printStackTrace();}
-         }
-    }
-
-}
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/views/ProblemMarkerAttrIds.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/views/ProblemMarkerAttrIds.java
deleted file mode 100644
index e510212..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv/src/org/eclipse/ptp/pldt/openmp/ui/pv/views/ProblemMarkerAttrIds.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006,2010 IBM Corp. 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corp. - initial implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.openmp.ui.pv.views;
-
-
-/**
- * IDs for OpenMP problem markers
- */
-public class ProblemMarkerAttrIds
-{
-    
-    /** identifies the OpenMP Error marker */
-    public static final String MARKER_ERROR_ID       = "org.eclipse.ptp.pldt.openmp.ui.pv.openMPProblemMarker"; //$NON-NLS-1$
- 
-    
-    /** Marker id for storage of additional information about the artifact */
-    public static final String   DESCRIPTION        = "description"; //$NON-NLS-1$
-    /** Marker ID for storage of the filename in which the artifact is found */
-    public static final String   RESOURCE           = "resource"; //$NON-NLS-1$
-    /** Marker ID for folder in which artifact is found */
-    public static final String   INFOLDER           = "infoldername"; //$NON-NLS-1$
-    /** Marker ID for location (line number) in which the artifact is found */
-    public static final String   LOCATION           = "location"; //$NON-NLS-1$
-    /** Marker ID that holds the problem object                           */
-    public static final String   PROBLEMOBJECT      = "problem"; //$NON-NLS-1$
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/.classpath b/tools/pldt/org.eclipse.ptp.pldt.upc/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="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.upc/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.upc/.cvsignore
deleted file mode 100644
index 2cc8dd1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-bin
-icons-old

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/.project b/tools/pldt/org.eclipse.ptp.pldt.upc/.project
deleted file mode 100644
index d663c1d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.upc</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<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.upc/.settings/org.eclipse.jdt.core.prefs b/tools/pldt/org.eclipse.ptp.pldt.upc/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index e157828..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,8 +0,0 @@
-#Fri Apr 16 12:53: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.upc/META-INF/MANIFEST.MF b/tools/pldt/org.eclipse.ptp.pldt.upc/META-INF/MANIFEST.MF
deleted file mode 100644
index 71eef49..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.pldt.upc;singleton:=true
-Bundle-Version: 4.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.pldt.upc.UPCPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.cdt.core,
- org.eclipse.cdt.ui,
- org.eclipse.ptp.pldt.common,
- org.eclipse.help,
- org.eclipse.cdt.doc.user,
- org.eclipse.cdt.core.parser.upc;bundle-version="5.0.0"
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Export-Package: org.eclipse.ptp.pldt.upc,
- org.eclipse.ptp.pldt.upc.actions,
- org.eclipse.ptp.pldt.upc.analysis,
- org.eclipse.ptp.pldt.upc.editorHelp,
- org.eclipse.ptp.pldt.upc.prefs,
- org.eclipse.ptp.pldt.upc.views
-Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/about.html b/tools/pldt/org.eclipse.ptp.pldt.upc/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/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.upc/build.properties b/tools/pldt/org.eclipse.ptp.pldt.upc/build.properties
deleted file mode 100644
index 1e19e56..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/build.properties
+++ /dev/null

@@ -1,10 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               icons/,\
-               html/,\
-               plugin.properties,\
-               templates/,\
-               about.html

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_MYTHREAD.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_MYTHREAD.html
deleted file mode 100644
index 367221c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_MYTHREAD.html
+++ /dev/null

@@ -1,23 +0,0 @@
-<h2><code>MYTHREAD</code> keyword</h2>
-
-
-<h4>Description</h4>
-<p>
-<code>MYTHREAD</code>  is an expression with a value of type int; it specifies the unique
-thread index. 
-<br>The range of possible values is <code>0..THREADS-16</code>.
-<h4>Example</h4>
-<p>The following program prints the numbers 0
-through <code>THREADS-1</code>, in some order.
-<pre>
-    #include &lt;upc.h&gt;
-    main(){ 
-      printf("%d ",MYTHREAD); 
-    }
-</pre>
-<p>See also <a href="id_THREADS.html"><code>THREADS</code></a>,
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_THREADS.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_THREADS.html
deleted file mode 100644
index 9a00383..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_THREADS.html
+++ /dev/null

@@ -1,15 +0,0 @@
-<h2><code><code>THREADS</code></code> keyword</h2>
-
-
-<h4>Description</h4>
-<p>
-<code>THREADS</code> is an expression with a value of type <code>int</code>; it specifies the number of
-threads and has the same value on every thread. Under the static <code>THREADS</code>
-translation environment, <code>THREADS</code> is an <code>int</code>eger constant suitable for use in
-#if preprocessing directives.
-
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_UPC_MAX_BLOCK_SIZE.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_UPC_MAX_BLOCK_SIZE.html
deleted file mode 100644
index f51f59c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_UPC_MAX_BLOCK_SIZE.html
+++ /dev/null

@@ -1,13 +0,0 @@
-<h2><code>UPC_MAX_BLOCK_SIZE</code> identifier</h2>
-
-
-<h4>Description</h4>
-<p>
-<code>UPC_MAX_BLOCK_SIZE</code>  is a predefined integer constant value. It indicates the
-maximum value allowed in a layout qualifier for shared data. It shall be
-suitable for use in <code>#if</code> preprocessing directives.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/index.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/index.html
deleted file mode 100644
index 01bb476..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/index.html
+++ /dev/null

@@ -1,62 +0,0 @@
-<h2 id="top">UPC Statements</h2>
-<ul>
-<li><a href="keywords.html">Keywords/Identifiers</a>
-<li><a href="keywords.html">Keywords</a>
-
-</ul>
-<h2 id="top">UPC functions</h2>
-<p>Termination of all threads
-<ul>
-<li><a href="upc_global_exit.html"> <code>upc_global_exit</code> </a>
-</ul>
-<p>Shared memory allocation functions
-<ul>
-<li><a href="upc_global_alloc.html"> <code>upc_global_alloc</code> </a>
-<li><a href="upc_all_alloc.html"> <code>upc_all_alloc</code> </a>
-<li><a href="upc_alloc.html"> <code>upc_alloc</code> </a>
-<li><a href="upc_local_alloc.html"> <code>upc_local_alloc</code> </a>  <i>deprecated</i>
-<li><a href="upc_free.html"> <code>upc_free</code> </a>
-</ul>
-
-<p>Pointer-to-shared manipulation functions
-<ul>
-<li><a href="upc_threadof.html"> <code>upc_threadof</code> </a>
-<li><a href="upc_phaseof.html"> <code>upc_phaseof</code> </a>
-<li><a href="upc_resetphase.html"> <code>upc_resetphase</code> </a>
-<li><a href="upc_addrfield.html"> <code>upc_addrfield</code> </a>
-<li><a href="upc_affinitysize.html"> <code>upc_affinitysize</code> </a>
-</ul>
-
-<p>Lock functions
-<ul>
-<li><a href="upc_lock_t.html"> <code>upc_lock_t</code> </a> &nbsp; type 
-<li><a href="upc_global_lock_alloc.html"> <code>upc_global_lock_alloc</code>  </a>
-<li><a href="upc_all_lock_alloc.html"> <code>upc_all_lock_alloc</code>  </a>
-<li><a href="upc_lock_free.html"> <code>upc_lock_free</code>  </a>
-<li><a href="upc_lock.html"> <code>upc_lock</code>  </a>
-<li><a href="upc_lock_attempt.html"> <code>upc_lock_attempt</code>  </a>
-<li><a href="upc_unlock.html"> <code>upc_unlock</code>  </a>
-</ul>
-
-<p>Shared string handling functions
-<ul>
-<li><a href="upc_memcpy.html"> <code>upc_memcpy</code> </a>
-<li><a href="upc_memget.html"> <code>upc_memget</code> </a>
-<li><a href="upc_memcpy.html"> <code>upc_memcpy</code> </a>
-<li><a href="upc_memset.html"> <code>upc_memset</code> </a>
-</ul>
-
-<p>Collective Utilities
-<ul>
-<li><a href="upc_all_broadcast.html"> <code>upc_all_broadcast</code> </a>
-<li><a href="upc_all_scatter.html"> <code>upc_all_scatter</code> </a>
-<li><a href="upc_all_gather.html"> <code>upc_all_gather</code> </a>
-<li><a href="upc_all_gather_all.html"> <code>upc_all_gather_all</code> </a>
-<li><a href="upc_all_exchange.html"> <code>upc_all_exchange</code> </a>
-<li><a href="upc_all_permute.html"> <code>upc_all_permute</code> </a>
-
-</ul>
-<p>
-See also <a href="terms.html">Terms, definitions, and symbols</a>
-<p>
-<a href="#top">Back to top</a>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/keywords.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/keywords.html
deleted file mode 100644
index 1e21ac3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/keywords.html
+++ /dev/null

@@ -1,25 +0,0 @@
-<h2>UPC Keywords/Identifiers</h2>
-<code>
-<ul>    
-<li><a href="id_MYTHREAD.html">MYTHREAD   </a>
-<li><a href="id_relaxed.html">relaxed       </a>
-<li><a href="id_shared.html">shared        </a>
-<li><a href="id_strict.html">strict       </a>
-<li><a href="id_THREADS.html">THREADS      </a>
-<li><a href="id_upc_barrier.html">upc_barrier         </a>
-<li><a href="id_upc_blocksizeof.html">upc_blocksizeof      </a>
-<li><a href="id_upc_elemsizeof.html">upc_elemsizeof      </a>
-<li><a href="id_upc_fence.html">upc_fence           </a>
-<li><a href="id_upc_localsizeof.html">upc_localsizeof   </a>
-<li><a href="id_UPC_MAX_BLOCKSIZE.html">UPC_MAX_BLOCKSIZE   </a>
-<li><a href="id_upc_notify.html">upc_notify   </a>
-<li><a href="id_upc_wait.html">upc_wait   </a>
-<li><a href="id_upc_forall.html">upc_forall        </a>     
-</ul>
-</code>
-
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/shared.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/shared.html
deleted file mode 100644
index f5fe38d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/shared.html
+++ /dev/null

@@ -1,18 +0,0 @@
-<h2><code><code>shared</code></code> keyword</h2>
-
-
-<h4>Description</h4>
-<p>
-<code>shared</code> indicates a variable is shared between threads.
-<p>
-<pre>
-shared int i;
-shared [2] int a[200];
-strict shared int i;
-</pre>
-
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/terms.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/terms.html
deleted file mode 100644
index abfa250..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/terms.html
+++ /dev/null

@@ -1,91 +0,0 @@
-<h4 id="top">UPC Terms, definitions and symbols</h4>
-<p>
-For the purpose of these specifications the following definitions apply.
-
-<dl>
-<dt><strong><strong>thread</strong></strong></dt>
-<dd>
-an instance of execution initiated by the execution environment at program
-startup.</dd>
-
-<dt><strong> </strong></dt>
-<dd> </dd>
-
-<dt><strong>object</strong></dt>
-<dd>
-region of data storage in the execution environment which can represent
-values.</dd>
-
-<dt><strong>shared object </strong></dt>
-<dd>
-an object allocated using a shared-qualified declarator or by a library function
-defined to create shared objects. 
-<p>Note: 
-All threads may access shared objects.</dd>
-
-<dt><strong>private object</strong></dt>
-<dd>
-any object which is not a shared object.
-<p>Note: Each thread declares and creates its own private objects which no
-other thread can access.</dd>
-<dt><strong> shared array</strong></dt>
-<dd>
-an array with elements that have shared qualified type.
-</dd>
-<dt><strong>affinity</strong></dt>
-<dd>
-logical association between shared objects and threads. Each element of data
-storage that contains shared objects has affinity to exactly one thread.
-</dd>
-<dt><strong>pointer-to-shared</strong></dt>
-<dd>
-a pointer whose referenced type is shared-qualified.
-</dd>
-<dt><strong> pointer-to-local</strong></dt>
-<dd>
-a pointer whose referenced type is not shared-qualified.
-</dd>
-<dt><strong>access</strong></dt>
-<dd>
-&lt;execution-time action&gt; to read or modify the value of an object by a thread.
-<p>The file scope declaration int y; creates a separate object for each thread to access.
-</dd>
-<dt><strong>shared access</strong></dt>
-<dd>
-an access using an expression whose type is shared-qualified.</dd>
-<dt><strong> strict shared read</strong></dt>
-<dd>
-a shared read access which is determined to be strict.</dd>
-<dt><strong>strict shared write</strong></dt>
-<dd>
-a shared modify access which is determined to be strict </dd>
-<dt><strong>relaxed shared read</strong></dt>
-<dd>
-a shared read access which is determined to be relaxed</dd>
-<dt><strong>relaxed shared write</strong></dt>
-<dd>
-a shared modify access which is determined to be relaxed </dd>
-<dt><strong>local access</strong></dt>
-<dd>
-an access using an expression whose type is not shared-qualified.
-</dd>
-<dt><strong>collective</strong></dt>
-<dd>
-a constraint placed on some language operations which requires evaluation
-of such operations to be matched across all threads. The behavior of collective
-operations is undefined unless all threads execute the same sequence of
-collective operations.</dd>
-<dt><strong>single-valued</strong></dt>
-<dd>
-an operand to a collective operation, which has the same value on every
-thread. The behavior of the operation is otherwise undefined.</dd>
-<dt><strong>phase</strong></dt>
-<dd>
-an unsigned integer value associated with a pointer-to-shared which indicates
-the element-offset within an affinity block; used in pointer-to-shared
-arithmetic to determine affinity boundaries</dd>
-</dl>
-<p>&nbsp
-<p>&nbsp
-<p><a href="#top">Back to  top</a>
-<p><a href="index.html">Back to index of all UPC functions</a>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_addrfield.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_addrfield.html
deleted file mode 100644
index b4133e68..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_addrfield.html
+++ /dev/null

@@ -1,19 +0,0 @@
-<h2>The <code>upc_addrfield</code> function</h2>
-
-<h4>Synopsis</h4>
-<pre>    
-    #include &lt;upc.h&gt;
-    size_t upc_addrfield(shared void *ptr);                 
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-The <code>upc_addrfield </code>  function returns an implementation-defined value reflecting
-the <q>local address</q>of the object pointed to by the pointer-to-shared
-argument.
-
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_affinitysize.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_affinitysize.html
deleted file mode 100644
index de6b81f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_affinitysize.html
+++ /dev/null

@@ -1,31 +0,0 @@
-<h2>The <code>upc_affinitysize</code> function</h2>
-
-<h4>Synopsis</h4>
-<pre>    
-    #include &lt;upc.h&gt;
-    size_t upc_affinitysize(size_t totalsize, 
-                            size_t nbytes,
-                            size_t threadid);                
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-The <code>upc_affinitysize </code>  function is a convenience function which calculates the exact size
-of the local portion of the data in a shared object with affinity to <code>threadid</code>.
-<p>In the case of a dynamically allocated shared object, the <code>totalsize</code> argument
-shall be <code>nbytes*nblocks</code> and the <code>nbytes</code> argument shall be <code>nbytes</code>,
-where <code>nblocks</code> and <code>nbytes</code> are exactly as passed to <code>upc_global_alloc</code> or
-<code>upc_all_alloc</code> when the object was allocated.
-<p>In the case of a statically allocated shared object with declaration:
-<pre>
-   shared [b] t d[s];
-   </pre>
-the <code>totalsize</code> argument shall be <code>s * sizeof(t)</code> and the <code>nbytes</code> argument
-shall be <code>b * sizeof(t)</code>. If the block size is indefinite, <code>nbytes</code> shall be 0.
-<p><code>threadid</code> shall be a value in <code>0..(THREADS-1)</code>.
-
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_alloc.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_alloc.html
deleted file mode 100644
index 4cb0943..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_alloc.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<h2 >The <code>upc_all_alloc</code>     </h2>
-
-<h4>Synopsis</h4>
-<pre> 
-    #include &lt;upc.h&gt;
-    shared void *upc_all_alloc(size_t nblocks, 
-                               size_t nbytes);   
-</pre>
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_all_alloc   </code> function allocates shared space compatible with the following
-declaration:
-<p><code>
-shared [nbytes] char[nblocks * nbytes].
-</code></p>
-<p>
-The <code>upc_all_alloc   </code> function returns the same pointer value on all threads.
-If nblocks*nbytes is zero, the result is a null pointer-to-shared.
-<p>The dynamic lifetime of an allocated object extends from the time any thread
-completes the call to <code>upc_all_alloc   </code> until any thread has deallocated the
-object.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_broadcast.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_broadcast.html
deleted file mode 100644
index a34903c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_broadcast.html
+++ /dev/null

@@ -1,77 +0,0 @@
-<h2>The <code>upc_all_broadcast</code> function</h2>
-<h4>Purpose</h4>
-<p>Copies a block of memory
-<h4>Synopsis</h4>
-<pre>    
-    #include &lt;upc.h&gt;
-    #include &lt;upc_collective.h&gt;
-    void upc_all_broadcast(shared void * restrict dst, shared const void * restrict src, size_t nbytes, upc_flag_t flags);             
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-The <code>upc_all_broadcast </code>  function  
-copies a block of memory with affinity to
-a single thread to a block of shared memory on each thread. The number of
-bytes in each block is <code>nbytes</code>.
-<p><code>nbytes</code> must be strictly greater than 0.
-<p><code>upc_all_broadcast </code> function treats the <code>src</code> pointer as if it pointed to a
-shared memory area with the type:
-<pre>
-    shared [] char[nbytes]
-    </pre>
-<p>The effect is equivalent to copying the entire array pointed to by <code>src</code> to each
-block of <code>nbytes</code> bytes of a shared array <code>dst</code> with the type:
-<pre>
-    shared [nbytes] char[nbytes * THREADS]
-</pre>
-<p>The target of the <code>dst</code> pointer must have affinity to thread 0.
-<p>The <code>dst</code> pointer is treated as if it has phase 0.
-
-<ul>
-<li>EXAMPLE 1 shows upc_all_broadcast
-
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-shared int A[THREADS];
-shared int B[THREADS];
-// Initialize A.
-upc_barrier;
-upc_all_broadcast( B, &A[1], sizeof(int),
-                   UPC_IN_NOSYNC | UPC_OUT_NOSYNC );
-upc_barrier;
-</pre>
-
-<li>EXAMPLE 2:
-
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared [] int A[NELEMS];
-shared [NELEMS] int B[NELEMS*THREADS];
-// Initialize A.
-upc_all_broadcast( B, A, sizeof(int)*NELEMS,
-                   UPC_IN_ALLSYNC | UPC_OUT_ALLSYNC );
-</pre>
-<li>EXAMPLE 3 shows <code>(A[3],A[4])</code> is broadcast to <code>(B[0],B[1]), (B[10],B[11]),
-(B[20],B[21]), ..., (B[NELEMS*(THREADS-1)],B[NELEMS*(THREADS-1)+1]).</code>
-
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared [NELEMS] int A[NELEMS*THREADS];
-shared [NELEMS] int B[NELEMS*THREADS];
-// Initialize A.
-upc_barrier;
-upc_all_broadcast( B, &A[3], sizeof(int)*2,
-                   UPC_IN_NOSYNC | UPC_OUT_NOSYNC );
-upc_barrier;
-</pre>
-</ul>
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_exchange.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_exchange.html
deleted file mode 100644
index ac50338..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_exchange.html
+++ /dev/null

@@ -1,72 +0,0 @@
-<h2>The <code>upc_all_exchange</code> function     </h2>
-
-<h4>Synopsis</h4>
-<pre> 
-    #include &lt;upc.h&gt;
-    #include &lt;upc_collective.h&gt;
-    void upc_all_exchange(shared void * restrict dst, 
-                          shared const void * restrict src, 
-                          size_t nbytes, upc_flag_t flags);  
-    </pre>
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_all_exchange   </code> function   copies the ith block of memory from a shared
-memory area that has affinity to thread j to the jth block of a shared memory
-area that has affinity to thread i. The number of bytes in each block is
-<code>nbytes</code>.
-<p><code>nbytes</code> must be strictly greater than 0.
-<p>
-<p>The <code>upc_all_exchange   </code> function treats the <code>src</code> pointer and the <code>dst</code> pointer
-as if each pointed to a shared memory area of <code>nbytes * THREADS</code> bytes on each
-thread and therefore had type:
-<pre>
-    shared [nbytes * THREADS] char[nbytes * THREADS * THREADS]
-</pre>
-<p>The targets of the <code>src</code> and <code>dst</code> pointers must have affinity to thread 0.
-<p>The <code>src</code> and <code>dst</code> pointers are treated as if they have phase 0.
-<p>For each pair of threads i and j, the effect is equivalent to copying the ith
-block of <code>nbytes</code> bytes that has affinity to thread j pointed to by <code>src</code> to the
-jth block of <code>nbytes</code> bytes that has affinity to thread i pointed to by <code>dst</code>.
-<ul>
-<li>EXAMPLE 1 <code>upc_all_exchange   </code> for the static THREADS translation environment.
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared [NELEMS*THREADS] int A[THREADS][NELEMS*THREADS];
-shared [NELEMS*THREADS] int B[THREADS][NELEMS*THREADS];
-// Initialize A.
-upc_barrier;
-upc_all_exchange( B, A, NELEMS*sizeof(int),
-UPC_IN_NOSYNC | UPC_OUT_NOSYNC );
-upc_barrier;
-</pre>
-
-<li>EXAMPLE 2 <code>upc_all_exchange   </code> for the dynamic THREADS translation environment.
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared int *Adata, *Bdata;
-shared [] int *myA, *myB;
-int i;
-
-Adata = upc_all_alloc(THREADS*THREADS, NELEMS*sizeof(int));
-myA = (shared [] int *)&Adata[MYTHREAD];
-Bdata = upc_all_alloc(THREADS*THREADS, NELEMS*sizeof(int));
-myB = (shared [] int *)&Bdata[MYTHREAD];
-// Adata and Bdata contain THREADS*THREADS*NELEMS elements.
-// myA and myB are MYTHREAD's rows of Adata and Bdata, resp.
-// Initialize MYTHREAD's row of A. For example,
-for (i=0; i&lt;NELEMS*THREADS; i++)
-myA[i] = MYTHREAD*10 + i;
-upc_all_exchange( Bdata, Adata, NELEMS*sizeof(int),
-                  UPC_IN_ALLSYNC | UPC_OUT_ALLSYNC );
-</pre>
-</ul>
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_gather.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_gather.html
deleted file mode 100644
index e5e55ca..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_gather.html
+++ /dev/null

@@ -1,67 +0,0 @@
-<h2>The <code>upc_all_gather</code> function</h2>
-
-<h4>Synopsis</h4>
-<pre>    
-    #include &lt;upc.h&gt;
-    #include &lt;upc_collective.h&gt;
-    void upc_all_gather(shared void * restrict dst, 
-                        shared const void * restrict src, 
-                        size_t nbytes, 
-                        upc_flag_t flags); 
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-The <code>upc_all_gather </code>  function 
-copies a block of shared memory that has
-affinity to the ith thread to the ith block of a shared memory area that has
-affinity to a single thread. The number of bytes in each block is <code>nbytes</code>.
-<p><code>nbytes</code> must be strictly greater than 0.
-<p>The upc all gather function treats the <code>src</code> pointer as if it pointed to a
-shared memory area of <code>nbytes</code> bytes on each thread and therefore had type:
-<pre>
-    shared [nbytes] char[nbytes * THREADS]
-</pre>
-<p>and it treats the <code>dst</code> pointer as if it pointed to a shared memory area with
-the type:
-<pre>
-    shared [] char[nbytes * THREADS]
-    </pre>
-<p>The target of the <code>src</code> pointer must have affinity to thread 0.
-<p>The <code>src</code> pointer is treated as if it has phase 0.
-<p>For each thread i, the effect is equivalent to copying the block of <code>nbytes</code> bytes
-pointed to by <code>src</code> that has affinity to thread i to the ith block of <code>nbytes</code>
-bytes pointed to by <code>dst</code>.
-<p>
-<ul>
-<li>EXAMPLE 1 <code>upc_all_gather </code> for the static THREADS translation environment.
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared [NELEMS] int A[NELEMS*THREADS];
-shared [] int B[NELEMS*THREADS];
-// Initialize A.
-upc_all_gather( B, A, sizeof(int)*NELEMS,
-UPC_IN_ALLSYNC | UPC_OUT_ALLSYNC );
-</pre>
-<li>EXAMPLE 2 <code>upc_all_gather </code> for the dynamic THREADS translation environment.
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared [NELEMS] int A[NELEMS*THREADS];
-shared [] int *B;
-B = (shared [] int *) upc_all_alloc(1,NELEMS*THREADS*sizeof(int));
-// Initialize A.
-upc_barrier;
-upc_all_gather( B, A, sizeof(int)*NELEMS,
-UPC_IN_NOSYNC | UPC_OUT_NOSYNC );
-upc_barrier;
-</pre>
-<li>
-<li>
-</ul>
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br><p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_gather_all.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_gather_all.html
deleted file mode 100644
index 4e3199e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_gather_all.html
+++ /dev/null

@@ -1,74 +0,0 @@
-<h2>The <code>upc_all_gather_all</code> function</h2>
-
-<h4>Synopsis</h4>
-<pre>    
-    #include &lt;upc.h&gt;
-    #include &lt;upc_collective.h&gt;
-    void upc_all_gather_all(shared void * restrict dst,
-                            shared const void * restrict src, 
-                            size_t nbytes,
-                            upc_flag_t flags);
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-The <code>upc_all_gather_all </code>  function 
-copies a block of memory from one shared
-memory area with affinity to the ith thread to the ith block of a shared
-memory area on each thread. The number of bytes in each block is <code>nbytes</code>.
-<p><code>nbytes</code> must be strictly greater than 0.
-<p>The upc_all_gather_all function treats the <code>src</code> pointer as if it pointed to a
-shared memory area of <code>nbytes</code> bytes on each thread and therefore had type:
-<pre>
-shared [nbytes] char[nbytes * THREADS]
-</pre>
-<p>and it treats the <code>dst</code>  pointer as if it pointed to a shared memory area with
-the type:
-shared [nbytes * THREADS] char[nbytes * THREADS * THREADS]
-<p>The targets of the <code>src</code> and <code>dst</code> pointers must have affinity to thread 0.
-<p>The <code>src</code> and <code>dst</code>  pointers are treated as if they have phase 0.
-<p>The effect is equivalent to copying the ith block of <code>nbytes</code> bytes pointed to
-by <code>src</code> to the ith block of <code>nbytes</code> bytes pointed to by <code>dst</code> that has affinity
-to each thread.
-
-
-
-<p>
-<ul>
-<li> EXAMPLE 1 <code>upc_all_gather_all </code> for the static THREADS translation environment.
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared [NELEMS] int A[NELEMS*THREADS];
-shared [NELEMS*THREADS] int B[THREADS][NELEMS*THREADS];
-// Initialize A.
-upc_barrier;
-upc_all_gather_all( B, A, sizeof(int)*NELEMS,
-UPC_IN_NOSYNC | UPC_OUT_NOSYNC );
-upc_barrier;
-</pre>
-<li>EXAMPLE 2 <code>upc_all_gather_all </code> all for the dynamic THREADS translation
-environment.
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared [NELEMS] int A[NELEMS*THREADS];
-shared int *Bdata;
-shared [] int *myB;
-Bdata = upc_all_alloc(THREADS*THREADS, NELEMS*sizeof(int));
-myB = (shared [] int *)&Bdata[MYTHREAD];
-// Bdata contains THREADS*THREADS*NELEMS elements.
-// myB is MYTHREADÕs row of Bdata.
-// Initialize A.
-upc_all_gather_all( Bdata, A, NELEMS*sizeof(int),
-UPC_IN_ALLSYNC | UPC_OUT_ALLSYNC );
-</pre>
-<li>
-<li>
-</ul>
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_lock_alloc.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_lock_alloc.html
deleted file mode 100644
index 8262913..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_lock_alloc.html
+++ /dev/null

@@ -1,21 +0,0 @@
-<h2 >The <code>upc_all_lock_alloc</code> function   </h2>
-
-<h4>Synopsis</h4>
-<pre> 
-    #include &lt;upc.h&gt;
-    upc_lock_t *upc_all_lock_alloc(void);                     
-</pre>
-
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_all_lock_alloc</code>    function dynamically allocates a lock and returns
-a pointer to it. The lock is created in an unlocked state.
-<p>The <code>upc_all_lock_alloc</code>  function is  a <i>collective</i> function. 
-The return value on every
-thread points to the same lock object.
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_permute.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_permute.html
deleted file mode 100644
index 86b93b4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_permute.html
+++ /dev/null

@@ -1,57 +0,0 @@
-<h2>The <code>upc_all_permute</code> function</h2>
-
-<h4>Synopsis</h4>
-<pre>    
-    #include &lt;upc.h&gt;
-    #include &lt;upc_collective.h&gt;
-    void upc_all_permute(shared void * restrict dst,
-        shared const void * restrict src,
-        shared const int * restrict perm,
-        size_t nbytes, upc_flag_t flags);
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-The <code>upc_all_permute </code>  function 
-copies a block of memory from a shared memory
-area that has affinity to the ith thread to a block of a shared memory
-that has affinity to thread perm[i]. The number of bytes in each block is
-<code>nbytes</code>.
-<p><code>nbytes</code> must be strictly greater than 0.
-<p><code>perm[0..THREADS-1]</code> must contain <code>THREADS</code>
-distinct values: 
-<code>0, 1, ..., THREADS-1.</code>
-<p>The <code>upc_all_permute </code> function treats the <code>src</code> pointer and the <code>dst</code> pointer
-as if each pointed to a shared memory area of <code>nbytes</code> bytes on each thread
-and therefore had type:
-<pre>
-    shared [<code>nbytes</code>] char[<code>nbytes</code> * THREADS]
-    </pre>
-<p>The targets of the <code>src</code>, perm, and <code>dst</code> pointers must have affinity to thread 0.
-<p>The <code>src</code> and <code>dst</code> pointers are treated as if they have phase 0.
-<p>The effect is equivalent to copying the block of <code>nbytes</code> bytes that has affinity
-to thread i pointed to by <code>src</code> to the block of <code>nbytes</code> bytes that has affinity
-to thread perm[i] pointed to by <code>dst</code>.
-<ul>
-<li>EXAMPLE 1: <code>upc_all_permute</code>
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared [NELEMS] int A[NELEMS*THREADS], B[NELEMS*THREADS];
-shared int P[THREADS];
-// Initialize A and P.
-upc_barrier;
-upc_all_permute( B, A, P, sizeof(int)*NELEMS,
-UPC_IN_NOSYNC | UPC_OUT_NOSYNC );
-upc_barrier;
-</pre>
-
-</ul>
-
- 
-</ul>
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_scatter.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_scatter.html
deleted file mode 100644
index 5b21e92..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_scatter.html
+++ /dev/null

@@ -1,76 +0,0 @@
-<h2>The <code>upc_all_scatter</code> function</h2>
-
-<h4>Synopsis</h4>
-<pre>    
-    #include &lt;upc.h&gt;
-    #include &lt;upc_collective.h&gt;
-    void upc_all_scatter(shared void * restrict dst, 
-                         shared const void * restrict src, 
-                         size_t nbytes, 
-                         upc_flag_t flags);
-               
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-The <code>upc_all_scatter </code>  function 
-copies the ith block of an area of shared
-memory with affinity to a single thread to a block of shared memory with
-affinity to the ith thread. The number of bytes in each block is <code>nbytes</code>.
-<p><code>nbytes</code> must be strictly greater than 0.
-<p>The <code>upc_all_scatter </code>  function treats the <code>src</code> pointer as if it pointed to a
-shared memory area with the type:
-<pre>
-    shared [] char[nbytes * THREADS]
- </pre>
-<p>and it treats the <code>dst</code> pointer as if it pointed to a shared memory area with
-the type:
-<pre>
-    shared [nbytes] char[nbytes * THREADS]
-</pre>
-<p>The target of the <code>dst</code> pointer must have affinity to thread 0.
-<p>The <code>dst</code> pointer is treated as if it has phase 0.
-<p>For each thread i, the effect is equivalent to copying the ith block of <code>nbytes</code>
-bytes pointed to by <code>src</code> to the block of <code>nbytes</code> bytes pointed to by 
-<code>dst</code> that
-has affinity to thread i.
-<ul>
-<li>EXAMPLE 1: <code>upc_all_scatter</code> for the dynamic THREADS translation environment.
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NUMELEMS 10
-#define SRC_THREAD 1
-shared int *A;
-shared [] int *myA, *srcA;
-shared [NUMELEMS] int B[NUMELEMS*THREADS];
-// allocate and initialize an array distributed across all threads
-A = upc_all_alloc(THREADS, THREADS*NUMELEMS*sizeof(int));
-myA = (shared [] int *) &A[MYTHREAD];
-for (i=0; i<NUMELEMS*THREADS; i++)
-myA[i] = i + NUMELEMS*THREADS*MYTHREAD; // (for example)
-// scatter the SRC_THREADÕs row of the array
-srcA = (shared [] int *) &A[SRC_THREAD];
-upc_barrier;
-upc_all_scatter( B, srcA, sizeof(int)*NUMELEMS,
-UPC_IN_NOSYNC | UPC_OUT_NOSYNC);
-upc_barrier;
-</pre>
-<li>EXAMPLE 2: <code>upc_all_scatter</code>  for the static THREADS translation environment.
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared [] int A[NELEMS*THREADS];
-shared [NELEMS] int B[NELEMS*THREADS];
- 
-// Initialize A.
-upc_all_scatter( B, A, sizeof(int)*NELEMS,
-UPC_IN_ALLSYNC | UPC_OUT_ALLSYNC );
-</pre>
- 
-</ul>
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_alloc.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_alloc.html
deleted file mode 100644
index 9f94bb0..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_alloc.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<h2 >The <code>upc_alloc</code> function    </h2>
-
-<h4>Synopsis</h4>
-<pre> 
-    #include &lt;upc.h&gt;
-    shared void *upc_alloc(size_t nbytes);                          
-</pre>
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_alloc  </code> allocates shared space of at least <code>nbytes</code> bytes with
-affinity to the calling thread.
-<p>
-<code>upc_alloc</code> is similar to malloc() except that it returns a pointer-to-shared
-value. It is not a <i>collective</i> function. If <code>nbytes</code> is zero, the result is a null
-pointer-to-shared.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_free.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_free.html
deleted file mode 100644
index 1dbf679..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_free.html
+++ /dev/null

@@ -1,27 +0,0 @@
-<h2 >The <code>upc_free</code> function   </h2>
-<h4>Synopsis</h4>
-<pre> 
-    #include &lt;upc.h&gt;
-    void upc_free(shared void *ptr);                         
-</pre>
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_free </code>   function frees the dynamically allocated shared storage pointed
-to by <code>ptr</code>. If <code>ptr</code> is a null pointer, no action occurs. Otherwise, if the
-argument does not match a pointer earlier returned by the 
-<a href="upc_alloc.html"><code>upc_alloc</code></a>,
-<a href="upc_global_alloc.html"><code>upc_global_alloc</code></a>,
-<a href="upc_all_alloc.html"><code>upc_all_alloc</code></a>, or 
-<a href="upc_local_alloc.html"><code>upc_local_alloc</code></a>
-function, or if the
-space has been deallocated by a previous call, by any thread 
-(i.e., only one thread may call <code>upc_free </code> for each allocation),
-to <code>upc_free</code>,
-the behavior is undefined.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_alloc.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_alloc.html
deleted file mode 100644
index 8373525..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_alloc.html
+++ /dev/null

@@ -1,26 +0,0 @@
-<h2 >upc_global_alloc</h2>
-
-<h4>Synopsis</h4>
-<p>
-<pre>
-    #include &lt;upc.h&gt;
-    shared void *upc_global_alloc(size_t nblocks, 
-                                  size_t nbytes);
-</pre>
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_global_alloc</code> allocates shared space compatible with the declaration:
-<p>
-<code>
-shared [nbytes] char[nblocks * nbytes]</code>
-<p>
-<code>upc_global_alloc</code> function is not a collective function. If called by
-multiple threads, all threads which make the call get different allocations. If
-<code>nblocks*nbytes</code> is zero, the result is a null pointer-to-shared.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_exit.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_exit.html
deleted file mode 100644
index 4b2f998..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_exit.html
+++ /dev/null

@@ -1,18 +0,0 @@
-<h2 >The <code>upc_global_exit</code> function </h2>
-<h4>Synopsis</h4>
-<pre>
-    #include &lt;upc.h&gt;
-    void upc_global_exit(int status);
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-<code>upc_global_exit() </code>
-flushes all I/O, releases all storage, and terminates the
-execution for all active threads.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_lock_alloc.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_lock_alloc.html
deleted file mode 100644
index e4e35ff..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_lock_alloc.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<h2 >The <code>upc_global_lock_alloc</code> function   </h2>
-<h4>Synopsis</h4>
-<p>
-
-<pre> 
-    #include &lt;upc.h&gt;
-    upc_lock_t *upc_global_lock_alloc(void);                      
-</pre>
-
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_global_lock_alloc </code>   function dynamically allocates a lock and returns
-a pointer to it. The lock is created in an unlocked state.
-<p>The <code>upc_global_lock_alloc </code> function is not a <i>collective</i> function.  If called
-by multiple threads, all threads which make the call get different allocations.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_local_alloc.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_local_alloc.html
deleted file mode 100644
index 5247a1a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_local_alloc.html
+++ /dev/null

@@ -1,29 +0,0 @@
-<h2 >The <code>upc_local_alloc</code> function &nbsp;&nbsp; <i>deprecated</i> </h2>
-
-<h4>Synopsis</h4>
-<p>
-<pre> 
-    #include &lt;upc.h&gt;
-    shared void *upc_local_alloc(size_t nblocks, 
-                                 size_t nbytes);                          
-</pre>
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_local_alloc </code> function is deprecated and should not be used. UPC
-programs should use the <code>upc_alloc </code> function instead. Support may be removed
-in future versions of this specification.
-<p>
-The <code>upc_local_alloc </code> function allocates shared space of at least 
-<code>nblocks * nbytes </code> bytes with affinity to the calling thread. If 
-<code>nblocks * nbytes </code>  is zero,
-the result is a null pointer-to-shared.
-<p>
-<code>upc_local_alloc </code> is similar to malloc() except that it returns a pointer-to-shared
-value. It is not a <i>collective</i> function.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock.html
deleted file mode 100644
index b10919e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock.html
+++ /dev/null

@@ -1,27 +0,0 @@
-<h2 >The <code>upc_lock</code> function   </h2>
-
-<h4>Synopsis</h4>
-<p>
-
-<pre> 
-    #include &lt;upc.h&gt;
-    void upc_lock(upc_lock_t *ptr);                  
-</pre>
-
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_lock</code>    function  sets the state of the lock pointed to by <code>ptr</code> to locked.
-<p>If the lock is already in locked state due to the calling thread setting it to
-locked state, the result is undefined.
-<p>If the lock is already in locked state, then the calling thread waits for some
-other thread to set the state to unlocked. 
-<p>Once the lock is in state unlocked, a single calling thread sets the state to
-locked and the function returns.
-<p>A null strict access is implied after a call to upc_lock().
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_attempt.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_attempt.html
deleted file mode 100644
index 7f92a9b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_attempt.html
+++ /dev/null

@@ -1,28 +0,0 @@
-<h2 >The <code>upc_lock_attempt</code> function   </h2>
-
-<h4>Synopsis</h4>
-<p>
-
-<pre> 
-    #include &lt;upc.h&gt;
-    int upc_lock_attempt(upc_lock_t *ptr);               
-</pre>
-
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_lock_attempt</code>    function  attempts to set the state of the lock pointed
-to by <code>ptr</code> to locked.
-<p>If the lock is already in locked state due to the calling thread setting it to
-locked state, the result is undefined.
-<p>If the lock is already in locked state the function returns 0.
-<p>If the lock is in state unlocked, a single calling thread sets the state to locked
-and the function returns 1.
-<p>A null strict access is implied after a call to upc_lock_attempt() that returns
-1.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_free.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_free.html
deleted file mode 100644
index c56d3f3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_free.html
+++ /dev/null

@@ -1,32 +0,0 @@
-<h2 >The <code>upc_lock_free</code> function   </h2>
-
-<h4>Synopsis</h4>
-<p>
-
-<pre> 
-    #include &lt;upc.h&gt;
-    upc_lock_t *upc_lock_free(upc_lock_t *ptr);                     
-</pre>
-
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_lock_free</code>    function  frees all resources associated with the dynamically
-allocated <code>upc_lock_t</code> pointed to by <code>ptr</code>. 
-If <code>ptr</code> is a null pointer, no
-action occurs. 
-Otherwise, if the argument does not match a pointer earlier
-returned by the <code>upc_global_lock_alloc</code> or 
-<code>upc_all_lock_alloc</code> function,
-or if the lock has been deallocated by a previous call to <code>upc_lock_free</code>,
-the behavior is undefined.
-<p>
-<code>upc_lock_free</code> succeeds regardless of whether the referenced lock is currently
-unlocked or currently locked (by any thread).
-<p>Any subsequent calls to locking functions from any thread using <code>ptr</code> have
-undefined effects. This also applies to any thread currently calling <code>upc_lock</code>.
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_t.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_t.html
deleted file mode 100644
index 42aa596..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_t.html
+++ /dev/null

@@ -1,24 +0,0 @@
-<h2>The <code>upc_lock_t</code> type</h2>
-
-<h4>Synopsis</h4>
-<p>The type declared is
-<pre>   
-    upc_lock_t               
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-The type <code>upc_lock_t </code>  is an opaque UPC type. <code>upc_lock_t </code> is a shared
-datatype with incomplete type (as defined in [ISO/IEC00 Sec 6.2.5]). 
-Objects
-of type <code>upc_lock_t </code> may therefore only be manipulated through pointers.
-Such objects have two states called locked and unlocked.
-<p>Two pointers to that reference the same lock object will compare as equal.
-The results of applying upc_phaseof(), upc_threadof(), and upc_addrfield()
-to such pointers are undefined.
-
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memcpy.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memcpy.html
deleted file mode 100644
index c5e4af6..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memcpy.html
+++ /dev/null

@@ -1,33 +0,0 @@
-<h2 >The <code>upc_memcpy</code> function   </h2>
-
-<h4>Synopsis</h4>
-<p>
-
-<pre> 
-    #include &lt;upc.h&gt;
-    void upc_memcpy(shared void * restrict dst, 
-                    shared const void * restrict src, 
-                    size_t n);
-                    
-</pre>
-
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_memcpy</code>    function  copies n characters from a shared object having
-affinity with one thread to a shared object having affinity with the same or
-another thread.
-<p>The <code>upc_memcpy</code> function treats the <code>dst</code> and <code>src</code> pointers as if 
-they had type:
-<pre>
-    shared [] char[n]
-</pre>
-The effect is equivalent to copying the entire contents from one shared array
-object with this type (the <code>src</code> array) to another shared array object with
-this type (the <code>dst</code> array).
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memget.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memget.html
deleted file mode 100644
index 6cbc444..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memget.html
+++ /dev/null

@@ -1,35 +0,0 @@
-<h2 >The <code>upc_memget</code> function   </h2>
-
-<h4>Synopsis</h4>
-<p>
-
-<pre> 
-    #include &lt;upc.h&gt;
-    void upc_memget(void * restrict dst, 
-                    shared const void * restrict src, 
-                    size_t n);
-                    
-</pre>
-
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_memget</code>    function  copies n characters from a shared object with affinity
-to any single thread to an object on the calling thread.
-<p>The <code>upc_memget</code> function treats the <code>src</code> pointer as if it had type:
-<pre>
-    shared [] char[n]
-    </pre>
-The effect is equivalent to copying the entire contents from one shared array
-object with this type (the <code>src</code> array) to an array object (the <code>dst</code> array)
-declared with the type
-<pre>
-    char[n]
-</pre>
-
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memset.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memset.html
deleted file mode 100644
index 184d820..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memset.html
+++ /dev/null

@@ -1,32 +0,0 @@
-<h2 >The <code>upc_memset</code> function   </h2>
-
-<h4>Synopsis</h4>
-<p>
-
-<pre> 
-    #include &lt;upc.h&gt;
-    void upc_memset(shared void *dst, 
-                    int c, 
-                    size_t n);
-                    
-</pre>
-
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_memset</code>    function  copies the value of c, converted to an unsigned
-char, to a shared object with affinity to any single thread. The number of
-bytes set is n.
-<p>The <code>upc_memset</code>  function treats the <code>dst</code> pointer as if had type:
-<pre>
-    shared [] char[n]
-</pre>
-    
-The effect is equivalent to setting the entire contents of a shared array object
-with this type (the <code>dst</code> array) to the value c.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_phaseof.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_phaseof.html
deleted file mode 100644
index bee4bfa..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_phaseof.html
+++ /dev/null

@@ -1,19 +0,0 @@
-<h2>The <code>upc_phaseof</code> function</h2>
-
-<h4>Synopsis</h4>
-<pre>    #include &lt;upc.h&gt;
-    size_t upc_phaseof(shared void *ptr);                          
-</pre>
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_phaseof </code> function  returns the phase component of the pointer-to-shared
-argument.
-<p>If <code>ptr</code> is a null pointer-to-shared, the function returns 0.
-
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_resetphase.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_resetphase.html
deleted file mode 100644
index 8327802..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_resetphase.html
+++ /dev/null

@@ -1,19 +0,0 @@
-<h2>The <code>upc_resetphase</code> function</h2>
-
-<h4>Synopsis</h4>
-<pre>    
-    #include &lt;upc.h&gt;
-    shared void *upc_resetphase(shared void *ptr);                     
-</pre>
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_resetphase </code> function   returns a pointer-to-shared which is identical
-to its input except that it has zero phase.
-
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_threadof.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_threadof.html
deleted file mode 100644
index a0b410b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_threadof.html
+++ /dev/null

@@ -1,20 +0,0 @@
-<h2 >The <code>upc_threadof</code> function &nbsp;&nbsp; </h2>
-
-<h4>Synopsis</h4>
-<p>
-<pre> 
-    #include &lt;upc.h&gt;
-    size_t upc_threadof(shared void *ptr);                        
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-The <code>upc_threadof </code>function returns the index of the thread that has affinity
-to the shared object pointed to by <code>ptr</code>.
-<p>
-If <code>ptr</code> is a null pointer-to-shared, the function returns 0.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_unlock.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_unlock.html
deleted file mode 100644
index 112d0ab..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_unlock.html
+++ /dev/null

@@ -1,24 +0,0 @@
-<h2 >The <code>upc_unlock</code> function   </h2>
-
-<h4>Synopsis</h4>
-<p>
-
-<pre> 
-    #include &lt;upc.h&gt;
-    void upc_unlock(upc_lock_t *ptr);              
-</pre>
-
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_unlock</code>    function  sets the state of the lock pointed to by <code>ptr</code> to
-unlocked.
-<p>Unless the lock is in locked state and the calling thread is the locking thread,
-the result is undefined.
-<p>A null strict access is implied before a call to upc unlock().
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/icons/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.upc/icons/.cvsignore
deleted file mode 100644
index 32f2eb8..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/icons/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-pspbrwse.jbf

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/icons/upc.gif b/tools/pldt/org.eclipse.ptp.pldt.upc/icons/upc.gif
deleted file mode 100644
index daa8733..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/icons/upc.gif
+++ /dev/null
Binary files differ

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/plugin.properties b/tools/pldt/org.eclipse.ptp.pldt.upc/plugin.properties
deleted file mode 100644
index 83c0025..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/plugin.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-pluginName=UPC support for PLDT
-pluginProvider=Eclipse.org
-
-view.name=UPC Artifact View
-viewcat.name=PTP UPC Views
-run.label=Run UPC Analysis
-run.tooltip=Run UPC Analysis on selected file, folder, or project to find UPC Artifacts
-
-#need to add more
-page.name = UPC
-extension.name = upc Artifact Marker
-specification.label = upc Annotation Marker
-command.name = find upc artifacts
-command.label = Show UPC Artifacts
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/plugin.xml b/tools/pldt/org.eclipse.ptp.pldt.upc/plugin.xml
deleted file mode 100644
index 8f04c29..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/plugin.xml
+++ /dev/null

@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   
-   <extension
-         point="org.eclipse.ui.preferencePages">
-         <page
-            class="org.eclipse.ptp.pldt.upc.prefs.UPCPreferencePage"
-            id="org.eclipse.ptp.pldt.upc.prefpage"
-            category="org.eclipse.ptp.pldt.common.prefs.PLDTPreferencePage"
-            name="%page.name"/>
-         
-   </extension>
-
-   <!--  UPC markers -->
-   <extension point="org.eclipse.core.resources.markers"
-		id="upcMarker"
-        name="%extension.name">
-      <super type="org.eclipse.core.resources.textmarker"/>
-   </extension>
-   <!-- this changes the marker image in the editor marker bar  -->
-   <extension
-         point="org.eclipse.ui.editors.annotationTypes">
-      <type
-            markerType="org.eclipse.ptp.pldt.upc.upcMarker"
-            name="org.eclipse.ptp.pldt.upc.upcMarkerAnnotation">
-      </type>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors.markerAnnotationSpecification">
-      <specification
-            annotationType="org.eclipse.ptp.pldt.upc.upcMarkerAnnotation"
-            icon="icons/upc.gif" 
-            
-            presentationLayer="3"
-            label="%specification.label"
-            
-            textPreferenceKey="upcIndication"
-            textPreferenceValue="true"
-            highlightPreferenceKey="artifactHighlighting"
-            highlightPreferenceValue="false"
-            colorPreferenceKey="artifactIndicationColor"
-            colorPreferenceValue="128,128,192"
-            verticalRulerPreferenceKey="artifactIndicationInVerticalRuler"
-            verticalRulerPreferenceValue="true"
-			showInNextPrevDropdownToolbarActionKey="showPortingInNextPrevDropdownToolbarAction"
-            showInNextPrevDropdownToolbarAction="false"
-            overviewRulerPreferenceKey="artifactIndicationInOverviewRuler"
-            overviewRulerPreferenceValue="true"
-            
-            includeOnPreferencePage="true"
-            isGoToPreviousNavigationTargetKey="isPortingGoToPreviousNavigationTarget"
-
-            isGoToNextNavigationTargetKey="isPortingRecordGoToNextNavigationTarget"
-            >
-      </specification>  
-   </extension>
-   <extension
-         point="org.eclipse.ui.views">
-      <view
-            name="%view.name"
-            icon="icons/upc.gif"
-            category="org.eclipse.ptp.ui.views"
-            class="org.eclipse.ptp.pldt.upc.views.UPCArtifactView"
-            id="org.eclipse.ptp.pldt.upc.views.upcArtifactView">
-      </view>
-   </extension>
-   <extension
-         point="org.eclipse.cdt.ui.CHelpProvider">
-      <provider
-            class="org.eclipse.ptp.pldt.upc.editorHelp.UPCCHelpInfoProvider"
-            id="org.eclipse.ptp.pldt.upc.editorHelp.UPCCHelpInfoProvider"/>
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            defaultHandler="org.eclipse.ptp.pldt.upc.actions.RunAnalyseUPCcommandHandler"
-            id="org.eclipse.ptp.pldt.upc.command2"
-            name="%command.name">
-      </command>
-   </extension>
-      <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            locationURI="menu:org.eclipse.ptp.pldt.common.toolbar.command1 ">
-         <command
-               commandId="org.eclipse.ptp.pldt.upc.command2"
-               icon="icons/upc.gif"
-               label="%command.label">
-         </command>
-      </menuContribution>
-   </extension>
-      <extension
-            point="org.eclipse.ui.editors.templates">
-         <include
-               file="templates/upc_templates.xml">
-         </include>
-      </extension>
-      <extension
-            point="org.eclipse.core.runtime.preferences">
-         <initializer
-               class="org.eclipse.ptp.pldt.upc.prefs.UPCPreferenceInitializer">
-         </initializer>
-      </extension>
-</plugin>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCArtifactMarkingVisitor.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCArtifactMarkingVisitor.java
deleted file mode 100644
index e3df505..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCArtifactMarkingVisitor.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.upc;
-
-import org.eclipse.ptp.pldt.common.ArtifactMarkingVisitor;
-
-public class UPCArtifactMarkingVisitor extends ArtifactMarkingVisitor
-{
-    public UPCArtifactMarkingVisitor(String markerId)
-    {
-        super(markerId);
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCIDs.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCIDs.java
deleted file mode 100644
index 21efe8e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCIDs.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008,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.upc;
-
-import org.eclipse.ptp.pldt.upc.messages.Messages;
-
-/**
- * UPC Plugin constants
- * 
- * @author Beth Tibbitts
- */
-public interface UPCIDs {
-	// preference page name for UPC
-	String UPC_INCLUDES = Messages.UPCIDs_upc_includes;
-
-	String MARKER_ID = "org.eclipse.ptp.pldt.upc.upcMarker"; //$NON-NLS-1$
-	String MARKER_ERROR_ID = "org.eclipse.ptp.pldt.upc.upcErrorMarker"; //$NON-NLS-1$
-
-	// artifact view id
-	String UPC_VIEW_ID = "org.eclipse.ptp.pldt.upc.views.upcArtifactView"; //$NON-NLS-1$
-	
-    /** 
-     * If we recognize UPC APIs by prefix (upc_) alone, we don't need the include file location and the hassle 
-     * that it causes for users to get it right.
-     */
-	public static final String UPC_RECOGNIZE_APIS_BY_PREFIX_ALONE = "upcRecognizeAPIsByPrefixAlone"; //$NON-NLS-1$
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCPlugin.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCPlugin.java
deleted file mode 100644
index ce84a65..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCPlugin.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008,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.upc;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class UPCPlugin extends AbstractUIPlugin {
-
-	/** The shared instance. */
-	private static UPCPlugin plugin;
-	public static final String PLUGIN_ID = "org.eclipse.ptp.pldt.upc"; //$NON-NLS-1$
-	
-	/**
-	 * The constructor.
-	 */
-	public UPCPlugin() {
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static UPCPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.ptp.pldt.upc", path); //$NON-NLS-1$
-	}
-    
-    /**
-     * Returns the preference setting for UPC include paths
-     * 
-     * @return
-     */
-    public List<String> getUPCIncludeDirs()
-    {
-        String stringList = getPluginPreferences().getString(UPCIDs.UPC_INCLUDES);
-        StringTokenizer st = new StringTokenizer(stringList, File.pathSeparator + "\n\r");//$NON-NLS-1$
-        List<String> dirs = new ArrayList<String>();
-        while (st.hasMoreElements()) {
-            dirs.add(st.nextToken());
-        }
-        return dirs;
-    }
-    
-    public static String getPluginId()
-    {
-        return PLUGIN_ID;
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/actions/RunAnalyseUPCcommandHandler.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/actions/RunAnalyseUPCcommandHandler.java
deleted file mode 100644
index 6cee0fe..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/actions/RunAnalyseUPCcommandHandler.java
+++ /dev/null

@@ -1,114 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008,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.upc.actions;
-
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.model.ITranslationUnit;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.actions.RunAnalyseHandlerBase;
-import org.eclipse.ptp.pldt.common.util.ViewActivator;
-import org.eclipse.ptp.pldt.upc.UPCArtifactMarkingVisitor;
-import org.eclipse.ptp.pldt.upc.UPCIDs;
-import org.eclipse.ptp.pldt.upc.UPCPlugin;
-import org.eclipse.ptp.pldt.upc.analysis.UPCCASTVisitor;
-
-/**
- * The "Find UPC Artifacts" action/command
- * 
- * @author Beth Tibbitts
- * 
- */
-public class RunAnalyseUPCcommandHandler extends RunAnalyseHandlerBase {
-	/**
-	 * Constructor for the "Run Analysis" action
-	 */
-	public RunAnalyseUPCcommandHandler() {
-		super("UPC", new UPCArtifactMarkingVisitor(UPCIDs.MARKER_ID), UPCIDs.MARKER_ID); //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns UPC analysis artifacts for file
-	 * 
-	 * @param file
-	 * @param includes
-	 *            UPC include paths
-	 * @return
-	 */
-	@Override
-	public ScanReturn doArtifactAnalysis(final ITranslationUnit tu, final List<String> includes) {
-		final ScanReturn msr = new ScanReturn();
-		final String fileName = tu.getElementName();
-		ILanguage lang;
-		boolean allowPrefixOnlyMatch=UPCPlugin.getDefault().getPreferenceStore().getBoolean(UPCIDs.UPC_RECOGNIZE_APIS_BY_PREFIX_ALONE);	
-		try {
-			lang = tu.getLanguage();
-
-			IASTTranslationUnit atu = tu.getAST();
-			if (lang.getId().equals(UPCLanguage.ID)) {// cdt40
-				atu.accept(new UPCCASTVisitor(includes, fileName, allowPrefixOnlyMatch, msr));
-			}
-
-		} catch (CoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return msr;
-	}
-
-	/**
-	 * Determination of whether or not a given filename is valid for UPC
-	 * artifact analysis <br>
-	 * TODO Consider using language or content-type instead of file extension?
-	 * Re-visit after https://bugs.eclipse.org/bugs/show_bug.cgi?id=237331 is
-	 * resolved (UPC content-type not recognized)
-	 * 
-	 * @param filename
-	 * @param isCPP
-	 *            is the project a C++ project or not
-	 * @return
-	 * 
-	 */
-	@Override
-	protected boolean validForAnalysis(String filename, boolean isCPP) {
-		int loc = filename.lastIndexOf("."); //$NON-NLS-1$
-		if (loc <= 0) // if no dot, or filename is ".foo", not valid for
-						// analysis.
-			return false;
-		String ext = filename.substring(loc + 1);
-		ext = ext.toLowerCase();
-		boolean result = true;
-		if (ext.equals("upc")) //$NON-NLS-1$
-			result = true;
-		else
-			result = false;
-		return result;
-	}
-
-	@Override
-	protected List<String> getIncludePath() {
-		return UPCPlugin.getDefault().getUPCIncludeDirs();
-	}
-
-	@Override
-	protected void activateArtifactView() {
-		ViewActivator.activateView(UPCIDs.UPC_VIEW_ID);
-	}
-    @Override
-	public boolean areIncludePathsNeeded() {
-    	boolean allowPrefixOnlyMatch= UPCPlugin.getDefault().getPreferenceStore().getBoolean(UPCIDs.UPC_RECOGNIZE_APIS_BY_PREFIX_ALONE);
-    	return !allowPrefixOnlyMatch;
-    }
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/analysis/UPCCASTVisitor.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/analysis/UPCCASTVisitor.java
deleted file mode 100644
index 69df2e7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/analysis/UPCCASTVisitor.java
+++ /dev/null

@@ -1,79 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008,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.upc.analysis;
-
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionCallExpression;
-import org.eclipse.cdt.core.dom.ast.IASTIdExpression;
-import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.analysis.PldtAstVisitor;
-import org.eclipse.ptp.pldt.upc.messages.Messages;
-
-/**
- * This dom-walker collects "artifacts" related to the specific domain <br>
- * (e.g. UPC). Currently these artifacts include function calls and constants.
- * It add markers to the source file for C code, marking the position of the
- * artifacts found.
- * 
- * This version extends PldtAstVisitor instead of delegating to<br>
- * MpiGeneralASTVisitorBehavior.
- * 
- * @author tibbitts
- * 
- */
-public class UPCCASTVisitor extends PldtAstVisitor {
-	private static final String PREFIX = "upc_"; //$NON-NLS-1$
-
-	{
-		this.shouldVisitExpressions = true;
-		this.shouldVisitStatements = true;
-		this.shouldVisitDeclarations = true;
-		this.shouldVisitTranslationUnit = true;
-	}
-
-    /**
-	 * @since 4.0
-	 */
-    public UPCCASTVisitor(List upcIncludes, String fileName, boolean allowPrefixOnlyMatch, ScanReturn msr){
-        super(upcIncludes, fileName, allowPrefixOnlyMatch, msr);
-		ARTIFACT_CALL = Messages.UPCCASTVisitor_upc_call;
-		ARTIFACT_CONSTANT = Messages.UPCCASTVisitor_upc_constant;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom
-	 * .ast.IASTExpression)
-	 */
-	@Override
-	public int visit(IASTExpression expression) {
-		if (expression instanceof IASTFunctionCallExpression) {
-			IASTExpression astExpr = ((IASTFunctionCallExpression) expression).getFunctionNameExpression();
-			String signature = astExpr.getRawSignature();
-			// System.out.println("func signature=" + signature);
-			if (signature.startsWith(PREFIX)) {
-				if (astExpr instanceof IASTIdExpression) {
-					IASTName funcName = ((IASTIdExpression) astExpr).getName();
-					processFuncName(funcName, astExpr);
-				}
-			}
-		} else if (expression instanceof IASTLiteralExpression) {
-			processMacroLiteral((IASTLiteralExpression) expression);
-		}
-		return PROCESS_CONTINUE;
-	}
-}
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/editorHelp/UPCCHelpBook.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/editorHelp/UPCCHelpBook.java
deleted file mode 100644
index 6702a10..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/editorHelp/UPCCHelpBook.java
+++ /dev/null

@@ -1,151 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008,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.upc.editorHelp;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.cdt.ui.IFunctionSummary;
-import org.eclipse.ptp.pldt.common.editorHelp.CHelpBookImpl;
-import org.eclipse.ptp.pldt.common.editorHelp.FunctionPrototypeSummaryImpl;
-import org.eclipse.ptp.pldt.common.editorHelp.FunctionSummaryImpl;
-import org.eclipse.ptp.pldt.upc.UPCPlugin;
-import org.eclipse.ptp.pldt.upc.messages.Messages;
-
-/**
- * UPC help book - this is the information that is used for the hover help
- * <p>
- * <b>Note:</b> This (and F1/dynamic help as well) requires a fix to CDT post-5.0.0 release
- * to org.eclipse.cdt.internal.core.model.TranslationUnit  - to recognize content-type of UPC to be a deriviative ("kindOf") the C content type.
- * <p>See https://bugs.eclipse.org/bugs/show_bug.cgi?id=237331  
- * @author Beth Tibbitts
- *
- */
-public class UPCCHelpBook extends CHelpBookImpl {
-	private static final String TITLE = Messages.UPCCHelpBook_upc_c_help_book_title;
-	private Map<String,String> desc=new HashMap<String, String>();
-
-	
-	public UPCCHelpBook() {
-        super(UPCPlugin.getPluginId());
-        // populate description map - this just makes the funcName2FuncInfo init lines a bit more terse
-      
-        desc.put("upc_addrfield", Messages.UPCCHelpBook_upc_addrfield);//$NON-NLS-1$
-        desc.put("upc_affinitysize", Messages.UPCCHelpBook_upc_affinitysize);//$NON-NLS-1$
-        desc.put("upc_all_alloc", Messages.UPCCHelpBook_upc_all_alloc);//$NON-NLS-1$
-        desc.put("upc_all_broadcast", Messages.UPCCHelpBook_upc_all_broadcast);//$NON-NLS-1$
-        desc.put("upc_all_lock_alloc", Messages.UPCCHelpBook_upc_all_lock_alloc);//$NON-NLS-1$
-        desc.put("upc_all_exchange", Messages.UPCCHelpBook_upc_all_exchange);//$NON-NLS-1$
-        desc.put("upc_all_gather",     Messages.UPCCHelpBook_upc_all_gather);//$NON-NLS-1$
-        desc.put("upc_all_gather_all", Messages.UPCCHelpBook_upc_all_gather_all);//$NON-NLS-1$
-        desc.put("upc_all_lock_alloc", Messages.UPCCHelpBook_upc_all_lock_alloc);//$NON-NLS-1$
-        desc.put("upc_all_permute", Messages.UPCCHelpBook_upc_all_permute);//$NON-NLS-1$
-        desc.put("upc_all_scatter", Messages.UPCCHelpBook_upc_all_scatter);//$NON-NLS-1$
-        desc.put("upc_alloc", Messages.UPCCHelpBook_upc_alloc);      //$NON-NLS-1$
-        desc.put("upc_free", Messages.UPCCHelpBook_upc_free);//$NON-NLS-1$
-        desc.put("upc_global_alloc",Messages.UPCCHelpBook_upc_global_alloc);//$NON-NLS-1$
-        desc.put("upc_global_exit",Messages.UPCCHelpBook_upc_global_exit);//$NON-NLS-1$
-        desc.put("upc_global_lock_alloc", Messages.UPCCHelpBook_upc_global_lock_alloc);//$NON-NLS-1$
-        desc.put("upc_local_alloc",Messages.UPCCHelpBook_upc_local_alloc);    //$NON-NLS-1$  
-        desc.put("upc_lock_attempt", Messages.UPCCHelpBook_upc_lock_attempt);//$NON-NLS-1$
-        desc.put("upc_lock_free", Messages.UPCCHelpBook_upc_lock_free);//$NON-NLS-1$
-        desc.put("upc_lock_t", Messages.UPCCHelpBook_upc_lock_t);//$NON-NLS-1$
-        desc.put("upc_lock", Messages.UPCCHelpBook_upc_lock);//$NON-NLS-1$
-        desc.put("upc_memcpy", Messages.UPCCHelpBook_upc_memcpy);//$NON-NLS-1$
-        desc.put("upc_memget", Messages.UPCCHelpBook_upc_memget);//$NON-NLS-1$
-        desc.put("upc_memset", Messages.UPCCHelpBook_upc_memset);//$NON-NLS-1$
-        desc.put("upc_phaseof", Messages.UPCCHelpBook_upc_phaseof);//$NON-NLS-1$
-        desc.put("upc_resetphase", Messages.UPCCHelpBook_upc_resetphase);//$NON-NLS-1$
-        desc.put("upc_threadof", Messages.UPCCHelpBook_upc_threadof);//$NON-NLS-1$
-        desc.put("upc_unlock", Messages.UPCCHelpBook_upc_unlock); //$NON-NLS-1$
-        desc.put("shared", Messages.UPCCHelpBook_upc_shared);//$NON-NLS-1$
-        
-        
-		// populate func map
-        //funcName2FuncInfo.put("upc_free", new FunctionSummaryImpl("upc_free", "", "upc_free test description",
-        //        new FunctionPrototypeSummaryImpl("upc_free", "void", "shared void *ptr"), null));
-        String desc = ""; // will do map lookup for description in fps method. //$NON-NLS-1$
-        funcName2FuncInfo.put("upc_addrfield", fps("upc_addrfield", "", desc, "size_t", "shared void *ptr"));//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        funcName2FuncInfo.put("upc_affinitysize", fps("upc_affinitysize", "", desc, "size_t", "size_t totalsize, size_t nbytes, size_t threadid"));//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        funcName2FuncInfo.put("upc_all_alloc", fps("upc_all_alloc", "", desc, "void", "size_t nblocks, size_t nbytes"));//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        funcName2FuncInfo.put("upc_all_broadcast", fps("upc_all_broadcast", "", desc, "void", "shared void * restrict dst, shared const void * restrict src, size_t nbytes, upc_flag_t flags"));//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        funcName2FuncInfo.put("upc_all_exchange", fps("upc_all_exchange", "", desc, "void", "shared void * restrict dst, shared const void * restrict src, size_t nbytes, upc_flag_t flags"));//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        funcName2FuncInfo.put("upc_all_gather_all", fps("upc_all_gather_all", "", desc, "void", "shared void * restrict dst, shared const void * restrict src, size_t nbytes, upc_flag_t flags"));//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        funcName2FuncInfo.put("upc_all_gather", fps("upc_all_gather", "", desc, "void", "shared void * restrict dst, shared const void * restrict src, size_t nbytes, upc_flag_t flags"));      //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$		
-        funcName2FuncInfo.put("upc_all_lock_alloc", fps("upc_all_lock_alloc", "", desc, "upc_lock_t", "void"));//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        funcName2FuncInfo.put("upc_all_permute", fps("upc_all_permute", "", desc, "void", "shared void * restrict dst, shared const void * restrict src, shared const int * restrict perm, size_t nbytes, upc_flag_t flags"));//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        funcName2FuncInfo.put("upc_all_scatter", fps("upc_all_scatter", "", desc, "void", "shared void * restrict dst, shared const void * restrict src, size_t nbytes, upc_flag_t flags"));//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        funcName2FuncInfo.put("upc_alloc", fps("upc_alloc", "", desc, "void", "size_t nbytes"));      //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        funcName2FuncInfo.put("upc_free", fps("upc_free", "", desc, "void", "shared void *ptr"));//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        funcName2FuncInfo.put("upc_global_alloc", fps("upc_global_alloc", "", desc, "void", "int status"));//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        funcName2FuncInfo.put("upc_global_exit", fps("upc_global_exit", "", desc, "void", "int status"));//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        funcName2FuncInfo.put("upc_global_lock_alloc", fps("upc_global_lock_alloc", "", desc, "upc_lock_t", "void"));//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        funcName2FuncInfo.put("upc_local_alloc", fps("upc_local_alloc", "", desc, "void", "size_t nblocks, size_t nbytes"));   //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ 
-        funcName2FuncInfo.put("upc_lock_attempt", fps("upc_lock_attempt", "", desc, "int", "upc_lock_t *ptr"));//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        funcName2FuncInfo.put("upc_lock_free", fps("upc_lock_free", "", desc, "upc_lock_t", "void"));//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        funcName2FuncInfo.put("upc_lock", fps("upc_lock", "", desc, "void", "upc_lock_t *ptr"));//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        funcName2FuncInfo.put("upc_memcpy", fps("upc_memcpy", "", desc, "void", "shared void * restrict dst, shared const void * restrict src, size_t n"));    //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$  
-        funcName2FuncInfo.put("upc_memget", fps("upc_memget", "", desc, "void", "void * restrict dst, shared const void * restrict src, size_t n"));//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        funcName2FuncInfo.put("upc_memset", fps("upc_memset", "", desc, "void", "shared void *dst, int c, size_t n"));//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        funcName2FuncInfo.put("upc_phaseof", fps("upc_memset", "", desc, "size_t", "shared void *ptr"));     //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        funcName2FuncInfo.put("upc_resetphase", fps("upc_resetphase", "", desc, "void", "shared void *ptr"));//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        funcName2FuncInfo.put("upc_threadof", fps("upc_threadof", "", desc, "size_t", "shared void *ptr"));//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        funcName2FuncInfo.put("upc_unlock", fps("upc_unlock", "", desc, "void", "upc_lock_t *ptr"));//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        funcName2FuncInfo.put("shared", fps("shared", "", desc, "", ""));//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-        
-        // set title
-        setTitle(TITLE);
-	}
-	
-	/**
-	 * Convenience function for inputting these FunctionPrototypeSummary and FunctionSummary arguments.
-	 * @param name
-	 * @param namespace
-	 * @param description if empty will do lookup in Map
-	 * @param returnType
-	 * @param args
-	 * @return
-	 */
-	protected IFunctionSummary fps(String name, String namespace, String description, String returnType, String args){
-		if(description==null || description.length()==0) {
-			description=getDesc(name);
-		}
-		IFunctionSummary fps = new FunctionSummaryImpl(name, namespace, description,
-                new FunctionPrototypeSummaryImpl(name, returnType, args), null);
-		return fps;
-	}
-	protected String getDesc(String key) {
-		String description = (String)desc.get(key);
-		if(description==null)
-			description=key+Messages.UPCCHelpBook_upc_description;
-		return description;
-	}
-	
-	/**
-	 * Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=237331
-	 * ("CHelpProvider not called for UPC")
-	 * so that UPC help will get called.
-	 * CDT bug fix required for this to work otherwise.
-	 * For example, in TranslationUnit to make the UPC type 'inherit' from the C type.
-	 * <p>
-	 * This returns an invalid number as a workaround.
-	 * This will cause the default part of the switch in CHelpBookDescriptor.matches()
-	 * to execute and the UPC help will
-	 * match for all files. Not pretty but it will work for now.
-	 * @see org.eclipse.cdt.internal.core.model.TranslationUnit
-	 * 
-	 */
-	@SuppressWarnings("restriction")// just for the javadoc comment to not get warning :)
-	@Override
-	public int getCHelpType() {
-		return -1;
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/editorHelp/UPCCHelpInfoProvider.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/editorHelp/UPCCHelpInfoProvider.java
deleted file mode 100644
index 3268b36..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/editorHelp/UPCCHelpInfoProvider.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.upc.editorHelp;
-
-import org.eclipse.ptp.pldt.common.editorHelp.CHelpProviderImpl;
-
-/**
- * 
- * This class implements ICHelpProvider and provides UPC information <br>
- * (F1, hover, content assist, etc.)
-  * <p>
- * <b>Note:</b> This  requires a fix to CDT post-5.0.0 release
- * to org.eclipse.cdt.internal.core.model.TranslationUnit  - to recognize content-type of UPC to be a deriviative ("kindOf") the C content type.
- * <p>See https://bugs.eclipse.org/bugs/show_bug.cgi?id=237331  
- * <p>Further note: a workaround has been applied in UCCCHelpBook to not require the CDT patch
- * 
- * 
- * @author Beth Tibbitts
- *
- */
-public class UPCCHelpInfoProvider extends CHelpProviderImpl {
-
-	public UPCCHelpInfoProvider() {
-		//System.out.println("UPCCHelpInfoProvider ctor()...");//debug only , to see when called
-	}
-
-	public void initialize() {
-		helpBook = new UPCCHelpBook();
-		//System.out.println("UPCCHelpInfoProvider initialize()...");
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/messages/Messages.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/messages/Messages.java
deleted file mode 100644
index e8b501c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/messages/Messages.java
+++ /dev/null

@@ -1,65 +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.upc.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.pldt.upc.messages.messages"; //$NON-NLS-1$
-	public static String UPCCHelpBook_upc_addrfield;
-	public static String UPCCHelpBook_upc_affinitysize;
-	public static String UPCCHelpBook_upc_all_alloc;
-	public static String UPCCHelpBook_upc_all_broadcast;
-	public static String UPCCHelpBook_upc_all_exchange;
-	public static String UPCCHelpBook_upc_all_gather;
-	public static String UPCCHelpBook_upc_all_gather_all;
-	public static String UPCCHelpBook_upc_all_lock_alloc;
-	public static String UPCCHelpBook_upc_all_permute;
-	public static String UPCCHelpBook_upc_all_scatter;
-	public static String UPCCHelpBook_upc_alloc;
-	public static String UPCCHelpBook_upc_c_help_book_title;
-	public static String UPCCHelpBook_upc_description;
-	public static String UPCCHelpBook_upc_free;
-	public static String UPCCHelpBook_upc_global_alloc;
-	public static String UPCCHelpBook_upc_global_exit;
-	public static String UPCCHelpBook_upc_global_lock_alloc;
-	public static String UPCCHelpBook_upc_local_alloc;
-	public static String UPCCHelpBook_upc_lock;
-	public static String UPCCHelpBook_upc_lock_attempt;
-	public static String UPCCHelpBook_upc_lock_free;
-	public static String UPCCHelpBook_upc_lock_t;
-	public static String UPCCHelpBook_upc_memcpy;
-	public static String UPCCHelpBook_upc_memget;
-	public static String UPCCHelpBook_upc_memset;
-	public static String UPCCHelpBook_upc_phaseof;
-	public static String UPCCHelpBook_upc_resetphase;
-	public static String UPCCHelpBook_upc_shared;
-	public static String UPCCHelpBook_upc_threadof;
-	public static String UPCCHelpBook_upc_unlock;
-	public static String UPCArtifactView_construct;
-	public static String UPCArtifactView_upc_artifact;
-	public static String UPCArtifactView_upc_artifacts;
-	public static String UPCCASTVisitor_upc_call;
-	public static String UPCCASTVisitor_upc_constant;
-	public static String UPCIDs_upc_includes;
-	public static String UPCPreferencePage_location_of_upc_help_files;
-	public static String UPCPreferencePage_please_choose_a_directory;
-	public static String UPCPreferencePage_preference_label_upc_include_paths;
-	public static String UPCPreferencePage_use_default;
-	public static String UPCPreferencePage_recognize_APIs_by_prefix_alone;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/messages/messages.properties b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/messages/messages.properties
deleted file mode 100644
index 2698b47..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/messages/messages.properties
+++ /dev/null

@@ -1,41 +0,0 @@
-UPCCHelpBook_upc_addrfield=Returns an implementation-defined value reflecting the <q>local address</q>of the object pointed to by the pointer-to-shared argument.
-UPCCHelpBook_upc_affinitysize=A convenience function which calculates the exact size of the local portion of the data in a shared object with affinity to <code>threadid</code>.
-UPCCHelpBook_upc_all_alloc=Allocates shared space
-UPCCHelpBook_upc_all_broadcast=Copies a block of memory with affinity to a single thread to a block of shared memory on each thread.
-UPCCHelpBook_upc_all_exchange=Copies the ith block of memory from a shared memory area that has affinity to thread j to the jth block of a shared memory area that has affinity to thread i
-UPCCHelpBook_upc_all_gather=Copies a block of shared memory that has affinity to the ith thread to the ith block of a shared memory area that has affinity to a single thread.
-UPCCHelpBook_upc_all_gather_all=Copies a block of memory from one shared memory area with affinity to the ith thread to the ith block of a shared memory area on each thread.
-UPCCHelpBook_upc_all_lock_alloc=Dynamically allocates a lock and returns a pointer to it. The lock is created in an unlocked state.
-UPCCHelpBook_upc_all_permute=Copies a block of memory from a shared memory area that has affinity to the ith thread to a block of a shared memory that has affinity to thread perm[i].
-UPCCHelpBook_upc_all_scatter=Copies the ith block of an area of shared memory with affinity to a single thread to a block of shared memory with affinity to the ith thread.
-UPCCHelpBook_upc_alloc=Allocates shared space of at least nbytes with affinity to the calling thread.
-UPCCHelpBook_upc_c_help_book_title=UPC C Help Book
-UPCCHelpBook_upc_description=\ description
-UPCCHelpBook_upc_free=Frees dynamically allocated shared storage
-UPCCHelpBook_upc_global_alloc=Allocates shared space
-UPCCHelpBook_upc_global_exit=Flushes all I/O, releases all storage, and terminates the execution for all active threads.
-UPCCHelpBook_upc_global_lock_alloc=Dynamically allocates a lock and returns a pointer to it. The lock is created in an unlocked state.
-UPCCHelpBook_upc_local_alloc=Deprecated. Use upc_alloc instead.\nAllocates shared space.
-UPCCHelpBook_upc_lock=Sets the state of a lock to locked.
-UPCCHelpBook_upc_lock_attempt=Attempts to set the state of a lock to locked. Return code indicates previous state.
-UPCCHelpBook_upc_lock_free=Frees all resources associated with a lock.
-UPCCHelpBook_upc_lock_t=UPC type for a lock
-UPCCHelpBook_upc_memcpy=Copies n characters from a shared object having affinity with one thread to a shared object having affinity with the same or another thread.
-UPCCHelpBook_upc_memget=Copies n characters from a shared object with affinity to any single thread to an object on the calling thread.
-UPCCHelpBook_upc_memset=Copies a value, converted to an unsigned char, to a shared object with affinity to any single thread.
-UPCCHelpBook_upc_phaseof=Returns the phase component of the pointer-to-shared argument.
-UPCCHelpBook_upc_resetphase=Returns a pointer-to-shared which is identical to its input except that it has zero phase
-UPCCHelpBook_upc_shared=this is a shared UPC keyword
-UPCCHelpBook_upc_threadof=Returns the index of the thread that has affinity to the shared object pointed to by the argument.
-UPCCHelpBook_upc_unlock=Sets the state of a lock to unlocked.
-UPCArtifactView_construct=Construct
-UPCArtifactView_upc_artifact=UPC Artifact
-UPCArtifactView_upc_artifacts=UPC Artifacts
-UPCCASTVisitor_upc_call=UPC Call
-UPCCASTVisitor_upc_constant=UPC Constant
-UPCIDs_upc_includes=UPC Includes
-UPCPreferencePage_location_of_upc_help_files=Location of UPC help files:
-UPCPreferencePage_please_choose_a_directory=Please choose a directory:
-UPCPreferencePage_preference_label_upc_include_paths=UPC include paths:
-UPCPreferencePage_use_default=Use default
-UPCPreferencePage_recognize_APIs_by_prefix_alone=Recognize APIs by prefix (upc_) alone?

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/prefs/UPCPreferenceInitializer.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/prefs/UPCPreferenceInitializer.java
deleted file mode 100644
index 2931087..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/prefs/UPCPreferenceInitializer.java
+++ /dev/null

@@ -1,32 +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.upc.prefs;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ptp.pldt.upc.UPCIDs;
-import org.eclipse.ptp.pldt.upc.UPCPlugin;
-
-/**
- * Class used to initialize default preference values.
- * @author Beth Tibbitts
- */
-public class UPCPreferenceInitializer extends AbstractPreferenceInitializer {
-
-	@Override
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = UPCPlugin.getDefault().getPreferenceStore();
-		store.setDefault(UPCIDs.UPC_RECOGNIZE_APIS_BY_PREFIX_ALONE, true);
-
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/prefs/UPCPreferencePage.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/prefs/UPCPreferencePage.java
deleted file mode 100644
index f2eebe2..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/prefs/UPCPreferencePage.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008,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.upc.prefs;
-
-import org.eclipse.jface.preference.BooleanFieldEditor;
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PathEditor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.pldt.upc.UPCIDs;
-import org.eclipse.ptp.pldt.upc.UPCPlugin;
-import org.eclipse.ptp.pldt.upc.messages.Messages;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-/**
- * Preference page based on FieldEditorPreferencePage
- * 
- * @author xue
- */
-
-public class UPCPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
-	private static final String INCLUDES_PREFERENCE_LABEL = Messages.UPCPreferencePage_preference_label_upc_include_paths;
-	private static final String INCLUDES_PREFERENCE_BROWSE = Messages.UPCPreferencePage_please_choose_a_directory;
-	private static final String UPC_HELP = Messages.UPCPreferencePage_location_of_upc_help_files;
-	private static final String UPC_HELP_DEFAULT = Messages.UPCPreferencePage_use_default;
-	private static final String UPC_HELP_DEFAULT_ID = "upcHelpUseDefault"; //$NON-NLS-1$
-	// private static final String UPC_HELP_LINUX="Use Linux location: ";
-	// private static final String UPC_HELP_AIX="Use AIX location: ";
-	// private static final String UPC_HELP_OTHER="Other:";
-	// private static final String UPC_HELP_OTHER_ID="upcHelpOther";
-
-	// private static final String
-	// UPC_LOCATION_AIX="/opt/rsct/lapi/eclipse/help";
-	// private static final String
-	// UPC_LOCATION_LINUX="opt/ibmhpc/lapi/eclipse/help";
-	
-	private static final String UPC_RECOGNIZE_APIS_BY_PREFIX_ALONE_LABEL = Messages.UPCPreferencePage_recognize_APIs_by_prefix_alone; //$NON-NLS-1$
-
-	private static final String UPC_WHICH_HELP_ID = "default"; // alternatives are: default, aix, linux, other //$NON-NLS-1$
-
-	public UPCPreferencePage() {
-		super(FLAT);
-		initPreferenceStore();
-	}
-
-	public UPCPreferencePage(int style) {
-		super(style);
-		initPreferenceStore();
-	}
-
-	public UPCPreferencePage(String title, ImageDescriptor image, int style) {
-		super(title, image, style);
-		initPreferenceStore();
-	}
-
-	public UPCPreferencePage(String title, int style) {
-		super(title, style);
-		initPreferenceStore();
-	}
-
-	/**
-	 * Init preference store and set the preference store for the preference
-	 * page
-	 */
-	private void initPreferenceStore() {
-		IPreferenceStore store = UPCPlugin.getDefault().getPreferenceStore();
-		setPreferenceStore(store);
-	}
-
-	public void init(IWorkbench workbench) {
-	}
-
-	@Override
-	protected void createFieldEditors() {
-        BooleanFieldEditor bPrefix = new BooleanFieldEditor(UPCIDs.UPC_RECOGNIZE_APIS_BY_PREFIX_ALONE, UPC_RECOGNIZE_APIS_BY_PREFIX_ALONE_LABEL, getFieldEditorParent());
-        addField(bPrefix);
-        
-		PathEditor pathEditor = new PathEditor(UPCIDs.UPC_INCLUDES, INCLUDES_PREFERENCE_LABEL, INCLUDES_PREFERENCE_BROWSE,
-				getFieldEditorParent());
-		addField(pathEditor);
-
-		// "Use default?"
-		// BooleanFieldEditor bed = new
-		// BooleanFieldEditor(UPC_HELP_DEFAULT_ID,UPC_HELP_DEFAULT,getFieldEditorParent());
-		// addField(bed);
-		/*
-		 * int numCol=1; RadioGroupFieldEditor choiceFE = new
-		 * RadioGroupFieldEditor(UPC_WHICH_HELP_ID, UPC_HELP, numCol, new
-		 * String[][] { { UPC_HELP_DEFAULT, "choice1" }, {
-		 * UPC_HELP_AIX+UPC_LOCATION_AIX, "choice2" }, {
-		 * UPC_HELP_LINUX+UPC_LOCATION_LINUX, "Choice3" }, { UPC_HELP_OTHER,
-		 * "Choice4" }}, getFieldEditorParent()); addField(choiceFE);
-		 * 
-		 * StringFieldEditor otherLoc=new StringFieldEditor(UPC_HELP_OTHER_ID,
-		 * UPC_HELP_OTHER,getFieldEditorParent()); addField(otherLoc);
-		 */
-
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/views/UPCArtifactView.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/views/UPCArtifactView.java
deleted file mode 100644
index 6090c06..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/views/UPCArtifactView.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008,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.upc.views;
-
-import org.eclipse.ptp.pldt.common.views.SimpleTableMarkerView;
-import org.eclipse.ptp.pldt.upc.UPCIDs;
-import org.eclipse.ptp.pldt.upc.UPCPlugin;
-import org.eclipse.ptp.pldt.upc.messages.Messages;
-
-/**
- * A UPC artifact view based on SimpleTableView <br>
- * Note that the ID must be unique.
- * 
- */
-public class UPCArtifactView extends SimpleTableMarkerView {
-	public UPCArtifactView() {
-		// if you need to read icon images, etc. from the plug-in, be sure to
-		// pass
-		// in an actual Plugin class instance for first arg
-		super(UPCPlugin.getDefault(), Messages.UPCArtifactView_upc_artifact, Messages.UPCArtifactView_upc_artifacts,
-				Messages.UPCArtifactView_construct, UPCIDs.MARKER_ID);
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/templates/upc_templates.xml b/tools/pldt/org.eclipse.ptp.pldt.upc/templates/upc_templates.xml
deleted file mode 100644
index 2234758..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/templates/upc_templates.xml
+++ /dev/null

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates>
-<template name="upc_init_shared_array"  id="org.eclipse.ptp.pldt.upc.templates.c.upcisa"
-	autoinsert="true" context="org.eclipse.cdt.ui.text.templates.c" deleted="false" 
-	description="Initialize a UPC shared array in a loop, with address affinity" enabled="true" >
-int ${i};
-upc_forall(${i}=0; ${i}&lt;N; ${i}++; &amp;${A}[${i}]) {
-	${A}[${i}]=&lt;init value&gt;;
-}
-upc_barrier;
-</template>
-<template name="upc_init_shared_array_int" id="org.eclipse.ptp.pldt.upc.templates.c.upcisai"
-     autoinsert="true" context="org.eclipse.cdt.ui.text.templates.c" deleted="false" 
-     description="Initialize a UPC shared array in a loop, with integer affinity" enabled="true" >
-int ${i};
-upc_forall(${i}=0; ${i}&lt;N; ${i}++; &amp;${A}[${i}]) {
-	${A}[${i}]=&lt;init value&gt;;
-}
-upc_barrier;
-</template>
-</templates>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/.classpath b/tools/pldt/org.eclipse.ptp.pldt.wizards/.classpath
deleted file mode 100644
index f218270..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/.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 excluding="org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/MPIProjectSetupRunnable.java" kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.wizards/.cvsignore
deleted file mode 100644
index fb97fc4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-bin
-@dot
-notes.txt

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/.project b/tools/pldt/org.eclipse.ptp.pldt.wizards/.project
deleted file mode 100644
index 4d6d42a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.wizards</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.wizards/.settings/org.eclipse.jdt.core.prefs b/tools/pldt/org.eclipse.ptp.pldt.wizards/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0aa5b45..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,8 +0,0 @@
-#Fri Apr 16 12:53:31 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.wizards/META-INF/MANIFEST.MF b/tools/pldt/org.eclipse.ptp.pldt.wizards/META-INF/MANIFEST.MF
deleted file mode 100644
index c4f6f65..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.pldt.wizards;singleton:=true
-Bundle-Version: 4.0.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.ptp.pldt.wizards.MpiWizardsPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.cdt.managedbuilder.ui,
- org.eclipse.cdt.managedbuilder.core,
- org.eclipse.cdt.core,
- org.eclipse.core.resources,
- org.eclipse.ptp.pldt.mpi.core,
- org.eclipse.ptp.pldt.common,
- org.eclipse.cdt.ui,
- org.eclipse.ptp.pldt.openmp.core
-Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.cdt.ui.wizards,
- org.eclipse.ui.wizards.newresource
-Export-Package: org.eclipse.ptp.pldt.wizards,
- org.eclipse.ptp.pldt.wizards.wizardPages
-Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/about.html b/tools/pldt/org.eclipse.ptp.pldt.wizards/about.html
deleted file mode 100644
index 9c7ba0a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/about.html
+++ /dev/null

@@ -1,24 +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>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
\ No newline at end of file

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/build.properties b/tools/pldt/org.eclipse.ptp.pldt.wizards/build.properties
deleted file mode 100644
index 5a9a7c3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/build.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 Texas Instruments Incorporated 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:
-#     Texas Instruments - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-               about.html,\
-               META-INF/,\
-               .,\
-               samples/,\
-               templates/,\
-               plugin.properties
-jars.compile.order = .
-source.. = src/
-output.. = bin/

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/plugin.properties b/tools/pldt/org.eclipse.ptp.pldt.wizards/plugin.properties
deleted file mode 100644
index 28c7e24..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/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 Parallel Language Development Tools New Project Wizards
-pluginProvider=Eclipse.org

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/plugin.xml b/tools/pldt/org.eclipse.ptp.pldt.wizards/plugin.xml
deleted file mode 100644
index c565667..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/plugin.xml
+++ /dev/null

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   
-      <extension point="org.eclipse.cdt.core.templates">
-      <template
-            filterPattern=".*"
-            id="org.eclipse.ptp.pldt.projects.MPIhelloWorldCProject"
-            location="templates/MPIhelloWorldCproject/template.xml"
-            pagesAfterTemplateSelectionProvider="org.eclipse.ptp.pldt.wizards.wizardPages.MPIProjectProcessPages"
-            projectType="org.eclipse.cdt.build.core.buildArtefactType.exe">
-      </template>
-      <template
-                  filterPattern=".*"
-                  id="org.eclipse.ptp.pldt.projects.MPIpiCProject"
-                  location="templates/MPIpiCproject/template.xml"
-                  pagesAfterTemplateSelectionProvider="org.eclipse.ptp.pldt.wizards.wizardPages.MPIProjectProcessPages"
-                  projectType="org.eclipse.cdt.build.core.buildArtefactType.exe">
-      </template>
-      <template
-                  filterPattern=".*"
-                  id="org.eclipse.ptp.pldt.projects.MPIpiCPPproject"
-                  location="templates/MPIpiCPPproject/template.xml"
-                  pagesAfterTemplateSelectionProvider="org.eclipse.ptp.pldt.wizards.wizardPages.MPIProjectProcessPagesCPP"
-                  projectType="org.eclipse.cdt.build.core.buildArtefactType.exe">
-      </template>
-      <template
-            filterPattern=".*"
-            id="org.eclipse.ptp.pldt.projects.MPIemptyCproject"
-            location="templates/MPIemptyCproject/template.xml"
-            pagesAfterTemplateSelectionProvider="org.eclipse.ptp.pldt.wizards.wizardPages.MPIProjectProcessPages"
-            projectType="org.eclipse.cdt.build.core.buildArtefactType.exe">
-      </template>
-      <template
-            filterPattern=".*"
-            id="org.eclipse.ptp.pldt.projects.OpenMPhelloWorldCProject"
-            location="templates/OpenMPhelloWorldCproject/template.xml"
-            pagesAfterTemplateSelectionProvider="org.eclipse.ptp.pldt.wizards.wizardPages.OpenMPProjectProcessPages"
-            projectType="org.eclipse.cdt.build.core.buildArtefactType.exe">
-      </template>
-      <template
-            filterPattern=".*"
-            id="org.eclipse.ptp.pldt.projects.OpenMPemptyCproject"
-            location="templates/OpenMPemptyCproject/template.xml"
-            pagesAfterTemplateSelectionProvider="org.eclipse.ptp.pldt.wizards.wizardPages.OpenMPProjectProcessPages"
-            projectType="org.eclipse.cdt.build.core.buildArtefactType.exe">
-      </template>
-   
-   </extension>
-      <extension point="org.eclipse.cdt.core.templateProcessTypes">
-         <processType
-               name="mpiProjectProcess"
-               processRunner="org.eclipse.ptp.pldt.wizards.wizardPages.MPIProjectProcess">
-         </processType>
-         <processType
-               name="openMPProjectProcess"
-               processRunner="org.eclipse.ptp.pldt.wizards.wizardPages.OpenMPProjectProcess">
-         </processType>
-         <processType
-               name="mpiProjectProcessCPP"
-               processRunner="org.eclipse.ptp.pldt.wizards.wizardPages.MPIProjectProcessCPP">
-         </processType>
-      </extension>
-
-</plugin>

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/samples/testMPI.c b/tools/pldt/org.eclipse.ptp.pldt.wizards/samples/testMPI.c
deleted file mode 100644
index efa16ce..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/samples/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.wizards/src/org/eclipse/ptp/pldt/wizards/MpiWizardsPlugin.java b/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/MpiWizardsPlugin.java
deleted file mode 100644
index f8cce8c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/MpiWizardsPlugin.java
+++ /dev/null

@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 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 Research - initial implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.wizards;
-
-import org.eclipse.ui.plugin.*;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.osgi.framework.BundleContext;
-import java.util.*;
-
-/**
- * The main plugin class for PLDT Wizards (MPI & OpenMP)
- * 
- * @author Beth Tibbitts
- */
-public class MpiWizardsPlugin extends AbstractUIPlugin {
-	//The shared instance.
-	private static MpiWizardsPlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-	
-	/**
-	 * The constructor.
-	 */
-	public MpiWizardsPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-		resourceBundle = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static MpiWizardsPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = MpiWizardsPlugin.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("org.eclipse.cdt.managedbuilder.ui.tests.TestsPluginResources"); //$NON-NLS-1$
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-		return resourceBundle;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.cdt.managedbuilder.ui.tests", path); //$NON-NLS-1$
-	}
-
-	public static String getPluginId() {
-		return "org.eclipse.ptp.pldt.wizards"; //$NON-NLS-1$
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/messages/Messages.java b/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/messages/Messages.java
deleted file mode 100644
index ee6a322..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/messages/Messages.java
+++ /dev/null

@@ -1,77 +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.wizards.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.pldt.wizards.messages.messages"; //$NON-NLS-1$
-	public static String AbstractProjectWizardPage_no;
-	public static String AbstractProjectWizardPage_preferences;
-	public static String AbstractProjectWizardPage_preferences_have_not_been_set;
-	public static String MPIProjectProcess_proj_does_not_exist_quit;
-	public static String MPIProjectProcess_project;
-	public static String MPIProjectProcess_unable_to_set_link_command;
-	public static String MPIProjectProcess_unable_to_set_link_command_toolchain_invalid_q;
-	public static String MPIProjectProcess_unable_to_set_linker_opt;
-	public static String MPIProjectProcess_unable_to_set_linker_opt_toolchain_invalid_q;
-	public static String MPIProjectWizardPage_add_mpi_proj_settings_to_proj;
-	public static String MPIProjectWizardPage_browse;
-	public static String MPIProjectWizardPage_default_project_setting_better_if_prefs_set;
-	public static String MPIProjectWizardPage_include_path;
-	public static String MPIProjectWizardPage_library_name;
-	public static String MPIProjectWizardPage_library_search_path;
-	public static String MPIProjectWizardPage_locn_of_mpi_incl_path;
-	public static String MPIProjectWizardPage_mpi;
-	public static String MPIProjectWizardPage_mpi_compile_cmd;
-	public static String MPIProjectWizardPage_mpi_include_path;
-	public static String MPIProjectWizardPage_mpi_lib_search_path;
-	public static String MPIProjectWizardPage_mpi_link_cmd;
-	public static String MPIProjectWizardPage_mpi_project_page;
-	public static String MPIProjectWizardPage_mpi_project_settings;
-	public static String MPIProjectWizardPage_no_mpi_preferences_set;
-	public static String MPIProjectWizardPage_no_mpi_prefs_set;
-	public static String MPIProjectWizardPage_select_mpi_incl_path_libname_and_etc;
-	public static String MPIProjectWizardPage_use_default_info;
-	public static String MPIProjectWizardPage_use_window_prefs_and_select_pldt;
-	public static String MPIProjectWizardPage_you_can_cancel_out_to_do_mpi_prefs;
-	public static String OpenMPProjectWizardPage_add_project_settings_to_this_project;
-	public static String OpenMPProjectWizardPage_browse;
-	public static String OpenMPProjectWizardPage_include_path;
-	public static String OpenMPProjectWizardPage_include_path_tooltip;
-	public static String OpenMPProjectWizardPage_lib_search_path;
-	public static String OpenMPProjectWizardPage_lib_search_path_tooltip;
-	public static String OpenMPProjectWizardPage_library_name;
-	public static String OpenMPProjectWizardPage_library_name_tooltip;
-	public static String OpenMPProjectWizardPage_no_prefs_set;
-	public static String OpenMPProjectWizardPage_no_prefs_set_2;
-	public static String OpenMPProjectWizardPage_no_prefs_set_3;
-	public static String OpenMPProjectWizardPage_no_prefs_set_4;
-	public static String OpenMPProjectWizardPage_no_prefs_set_5;
-	public static String OpenMPProjectWizardPage_omp_compile_command;
-	public static String OpenMPProjectWizardPage_omp_link_command;
-	public static String OpenMPProjectWizardPage_omp_project_settings_title;
-	public static String OpenMPProjectWizardPage_openmp_include_path;
-	public static String OpenMPProjectWizardPage_openmp_project_page;
-	public static String OpenMPProjectWizardPage_openmp_project_settings;
-	public static String OpenMPProjectWizardPage_openp_library_search_path;
-	public static String OpenMPProjectWizardPage_select_stuff_to_be_added_to_proj;
-	public static String OpenMPProjectWizardPage_use_default_info_q;
-	// public static String project;
-	// public static String project_does_not_exist;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/messages/messages.properties b/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/messages/messages.properties
deleted file mode 100644
index a327f05..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/messages/messages.properties
+++ /dev/null

@@ -1,51 +0,0 @@
-AbstractProjectWizardPage_no=No 
-AbstractProjectWizardPage_preferences=\ Preferences
-AbstractProjectWizardPage_preferences_have_not_been_set=\ Preferences have not been set.  Do you want to set them now?
-MPIProjectProcess_proj_does_not_exist_quit=Project does not exist\!. Quitting. No MPI info added to project.
-MPIProjectProcess_project=Project: 
-MPIProjectProcess_unable_to_set_link_command=Unable to set link command
-MPIProjectProcess_unable_to_set_link_command_toolchain_invalid_q=Unable to set link command.\nNo ITool linker available... is toolchain invalid?
-MPIProjectProcess_unable_to_set_linker_opt=Unable to set linker option
-MPIProjectProcess_unable_to_set_linker_opt_toolchain_invalid_q=Unable to set linker option.\nNo ITool available... is toolchain invalid?
-MPIProjectWizardPage_mpi_compile_cmd=MPI compile command: 
-MPIProjectWizardPage_mpi_project_settings=MPI Project Settings
-MPIProjectWizardPage_mpi=MPI
-MPIProjectWizardPage_no_mpi_preferences_set=No MPI Preferences set; 
-MPIProjectWizardPage_default_project_setting_better_if_prefs_set=Default project setting will be more useful if MPI preferences are set first. 
-MPIProjectWizardPage_use_window_prefs_and_select_pldt=\nUse Window > Preferences and select Parallel Language Development Tools, which may be under PTP preferences.
-MPIProjectWizardPage_you_can_cancel_out_to_do_mpi_prefs=You can cancel out of new project wizard to enter MPI preferences now.
-MPIProjectWizardPage_no_mpi_prefs_set=No MPI Preferences set
-MPIProjectWizardPage_mpi_include_path=MPI Include path:
-MPIProjectWizardPage_mpi_lib_search_path=MPI library search path:
-MPIProjectWizardPage_include_path=Include path:
-MPIProjectWizardPage_locn_of_mpi_incl_path=Location of MPI include path(s)
-MPIProjectWizardPage_browse=Browse...
-MPIProjectWizardPage_library_name=Library name:
-MPIProjectWizardPage_library_search_path=Library search path:
-MPIProjectWizardPage_mpi_link_cmd=MPI link command: 
-MPIProjectWizardPage_add_mpi_proj_settings_to_proj=Add MPI project settings to this project
-MPIProjectWizardPage_use_default_info=Use default information
-MPIProjectWizardPage_select_mpi_incl_path_libname_and_etc=Select the MPI include path, lib name, library search path, and build command information to be automatically be added to the new project.
-MPIProjectWizardPage_mpi_project_page=MPI Project Page
-OpenMPProjectWizardPage_add_project_settings_to_this_project=Add OpenMP project settings to this project
-OpenMPProjectWizardPage_browse=Browse...
-OpenMPProjectWizardPage_include_path=Include path:
-OpenMPProjectWizardPage_include_path_tooltip=Location of OpenMP include path(s)
-OpenMPProjectWizardPage_lib_search_path=Library search path:
-OpenMPProjectWizardPage_lib_search_path_tooltip=Library name:
-OpenMPProjectWizardPage_library_name=Library name:
-OpenMPProjectWizardPage_library_name_tooltip=Library name:
-OpenMPProjectWizardPage_no_prefs_set=No OpenMP Preferences set; 
-OpenMPProjectWizardPage_no_prefs_set_2=Default project setting will be more useful if OpenMP preferences are set first. 
-OpenMPProjectWizardPage_no_prefs_set_3=\nUse Window > Preferences and select Parallel Language Development Tools, which may be under PTP preferences.
-OpenMPProjectWizardPage_no_prefs_set_4=You can cancel out of new project wizard to enter OpenMP preferences now.
-OpenMPProjectWizardPage_no_prefs_set_5=No OpenMP Preferences set
-OpenMPProjectWizardPage_omp_compile_command=OpenMP compile command: 
-OpenMPProjectWizardPage_omp_link_command=OpenMP link command: 
-OpenMPProjectWizardPage_omp_project_settings_title=OpenMP Project Settings
-OpenMPProjectWizardPage_openmp_include_path=OpenMP Include path:
-OpenMPProjectWizardPage_openmp_project_page=OpenMP Project Page
-OpenMPProjectWizardPage_openmp_project_settings=OpenMP Project Settings
-OpenMPProjectWizardPage_openp_library_search_path=OpenMP library search path:
-OpenMPProjectWizardPage_select_stuff_to_be_added_to_proj=Select the OpenMP include path, lib name, library search path, and build command information to be automatically be added to the new project.
-OpenMPProjectWizardPage_use_default_info_q=Use default information

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/AbstractProjectWizardPage.java b/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/AbstractProjectWizardPage.java
deleted file mode 100644
index 7292a08..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/AbstractProjectWizardPage.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2010 IBM Corp. 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 Corp. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.wizards.wizardPages;
-
-import org.eclipse.cdt.ui.templateengine.AbstractWizardDataPage;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.preference.IPreferenceNode;
-import org.eclipse.jface.preference.IPreferencePage;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.preference.PreferenceManager;
-import org.eclipse.jface.preference.PreferenceNode;
-import org.eclipse.ptp.pldt.wizards.messages.Messages;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Common behavior between the different PLDT new project wizard pages
- * @author beth
- *
- */
-public abstract class AbstractProjectWizardPage extends AbstractWizardDataPage{
-
-	protected IPreferenceStore preferenceStore;
-	protected IPreferencePage preferencePage;
-	protected String prefIDincludes;
-
-	public AbstractProjectWizardPage(String string) {
-		super(string);
-	}
-	/**
-	 * Inform the user that PLDT preferences have not been set, and offer to set them now,
-	 * and return the include path.
-	 * @param type - e.g. "MPI" or "OpenMP" the type of preferences that aren't set
-	 * @return
-	 */
-	protected  String showNoPrefs(String type, String prefID) {
-		Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-		
-		//IPreferencePage pp = new MPIPreferencePage();
-		//MessageDialogWithLink md = new MessageDialogWithLink(shell,"MPI", "MPI preferences have not been set. Click below to do it now.","Click here to add MPI preferencess now",pp);
-		//int result = md.open();
-		
-		String msg = type+Messages.AbstractProjectWizardPage_preferences_have_not_been_set;
-		boolean doit = MessageDialog.openQuestion(shell, Messages.AbstractProjectWizardPage_no+type+Messages.AbstractProjectWizardPage_preferences, msg);
-		if(doit) {
-			showPreferenceDialog(type);
-		}
-		String mip = preferenceStore.getString(prefID);
-		return mip;
-	}
-	private void showPreferenceDialog(String type) {
-		PreferenceManager mgr = new PreferenceManager();
-		IPreferencePage preferencePage = getPreferencePage();
-		preferencePage.setTitle(type);
-		IPreferenceNode node = new PreferenceNode("1", preferencePage); //$NON-NLS-1$
-		mgr.addToRoot(node);
-		Shell shell = Display.getCurrent().getActiveShell();
-		PreferenceDialog dialog = new PreferenceDialog(shell, mgr);
-		dialog.create();
-		// must do dialog.create() before setting message
-		dialog.setMessage(preferencePage.getTitle()); 
-		dialog.open();
-	}
-	abstract IPreferencePage getPreferencePage();
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcess.java b/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcess.java
deleted file mode 100644
index 2dedebe..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcess.java
+++ /dev/null

@@ -1,549 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006,2010 IBM Corp. 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corp. - initial implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.wizards.wizardPages;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.cdt.core.templateengine.TemplateCore;
-import org.eclipse.cdt.core.templateengine.process.ProcessArgument;
-import org.eclipse.cdt.core.templateengine.process.ProcessFailureException;
-import org.eclipse.cdt.core.templateengine.process.ProcessRunner;
-import org.eclipse.cdt.managedbuilder.core.BuildException;
-import org.eclipse.cdt.managedbuilder.core.IConfiguration;
-import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
-import org.eclipse.cdt.managedbuilder.core.IManagedProject;
-import org.eclipse.cdt.managedbuilder.core.IOption;
-import org.eclipse.cdt.managedbuilder.core.ITool;
-import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.ptp.pldt.wizards.MpiWizardsPlugin;
-import org.eclipse.ptp.pldt.wizards.messages.Messages;
-
-/**
- * 
- * After the MPIProjectWizardPage runs, and we get MPI include path from the user,
- * we have this opportunity to use that information to modify the include paths, build cmd,  etc.
- * in the project
- * 
- * <p>This handles plain C projects; MPIProjectProcessCPP extends this to handle C++ projects
- * 
- * @author Beth Tibbitts
- *
- */
-public class MPIProjectProcess extends ProcessRunner {
-	private static final boolean traceOn=false;
-	private boolean wizTraceOn=MPIProjectWizardPage.wizardTraceOn;
-	//private static final templateID=
-
-	protected Map<String,String> valueStore;
-	
-	@Override
-	public void process(TemplateCore template, ProcessArgument[] args,
-			String processId, IProgressMonitor monitor)
-			throws ProcessFailureException {
-		if(wizTraceOn)System.out.println("MPIProjectProcess().run()..."); //$NON-NLS-1$
-		
-		valueStore= template.getValueStore();
-		String pageID = MPIProjectWizardPage.PAGE_ID;
-
-		Object obj = getNewPropValue(pageID, MPIProjectWizardPage.DO_MPI_INCLUDES, null);
-		// use the default value if nothing was set in the pageData by the user
-		boolean doMpiIncludes = MPIProjectWizardPage.getDefaultUseMpiIncludes();
-		if (obj != null)
-			doMpiIncludes = Boolean.valueOf((String) obj);
-		if (!doMpiIncludes) {
-			if (traceOn)
-				System.out.println("Do not save MPI info in this project."); //$NON-NLS-1$
-			return;
-		}
-
- 		// this process must be executed after a separate process which creates the project
-		IProject proj= ResourcesPlugin.getWorkspace().getRoot().getProject(valueStore.get("projectName")); //$NON-NLS-1$
-		if(!proj.exists()) {
-			System.out.println(Messages.MPIProjectProcess_proj_does_not_exist_quit);
-			return;	
-		}
-
-		if(traceOn)System.out.println(Messages.MPIProjectProcess_project + proj.getName());
-
-		// Collect the values that the user entered on the wizard page
-		String propID = MPIProjectWizardPage.INCLUDE_PATH_PROP_ID;
-		String newIncludePath = getNewPropValue(pageID, propID,"c:/mpich2/include"); //$NON-NLS-1$
-		if(traceOn)System.out.println("Got prop: "+propID+"="+newIncludePath); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		propID = MPIProjectWizardPage.LIB_PROP_ID;
-		String newLib=getNewPropValue(pageID,propID,"lib"); //$NON-NLS-1$
-		
-		propID=MPIProjectWizardPage.LIBRARY_SEARCH_PATH_PROP_ID;
-		String newLibSearchPath=getNewPropValue(pageID,propID,"c:/mpich2/lib"); //$NON-NLS-1$
-		
-		propID=MPIProjectWizardPage.MPI_COMPILE_COMMAND_PROP_ID;
-		String mpiCompileCommand=getNewPropValue(pageID,propID,"mpicc"); //$NON-NLS-1$
-		
-		propID=MPIProjectWizardPage.MPI_LINK_COMMAND_PROP_ID;
-		String mpiLinkCommand=getNewPropValue(pageID,propID,"mpicc"); //$NON-NLS-1$
-
-		IManagedBuildInfo info = null;
-		try {
-			info = ManagedBuildManager.getBuildInfo(proj);
-			// note: assumed null if this is not a managed build project? will we get here in that case?
-			if(traceOn)System.out.println("Build info: " + info); //$NON-NLS-1$
-		} catch (Exception e) {
-			System.out.println("MPIProjectProcess.run(), "+e.getMessage()); //$NON-NLS-1$
-			e.printStackTrace();
-			return;
-		}
-		assert(info!=null);
-		
-		IManagedProject mProj = info.getManagedProject();
-		if(traceOn)showOptions(mProj);
-		
-		// add the include path, linker, build cmd, etc.  values to all the configurations
-		IConfiguration[] configs = mProj.getConfigurations();
-		for (int i = 0; i < configs.length; i++) {
-			IConfiguration cf = configs[i];
-			if(traceOn)System.out.println("Config " + i + ": " + cf.getName()); //$NON-NLS-1$ //$NON-NLS-2$
-			addIncludePath(cf, newIncludePath);
-			addLinkerOpt(cf,newLib,newLibSearchPath);
-			setCompileCommand(cf,mpiCompileCommand);
-			setLinkCommand(cf,mpiLinkCommand);		
-		}
-		if(traceOn)System.out.println("MPIProjectProcess, newIncludePath: "+newIncludePath); //$NON-NLS-1$
-		if(traceOn)System.out.println("   newLib: "+newLib+"  newLibSrchPth: "+newLibSearchPath); //$NON-NLS-1$ //$NON-NLS-2$
-		if(traceOn)System.out.println("   compileCmd: "+mpiCompileCommand); //$NON-NLS-1$
-		if(traceOn)System.out.println("   linkCmd: "+mpiLinkCommand); //$NON-NLS-1$
-		// ManagedBuildManger.saveBuildInfo(...) assures that the
-		// values are persisted in the build model, otherwise they will
-		// be lost when you shut down Eclipse.
-		if(traceOn)System.out.println("ManagedBuildManager.saveBuildInfo..."); //$NON-NLS-1$
-		
-		ManagedBuildManager.saveBuildInfo(proj, true);
-
-	}
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = MpiWizardsPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Get a value that was possibly obtained from the user on the associated wizard page.
-	 * @param pageID The pageID for our wizard page
-	 * @param propID The propID of the value we want
-	 * @param defaultVal The default value to use if the user didn't select anything,
-	 * or if we haven't gotten around to LETTING the user select anything yet.
-	 * @return
-	 */
-	protected String getNewPropValue(String pageID, String propID, String defaultVal) {
-		Object obj = valueStore.get(pageID+MPIProjectWizardPage.DOT+propID);
-		// if selection made on page, obj is non-null.
-		String newValue = defaultVal;
-		String msg=" ( used default value)"; //$NON-NLS-1$
-		if (obj != null) {
-			newValue = obj.toString();
-			msg=""; //$NON-NLS-1$
-		}
-		if(traceOn)System.out.println("propID=" + propID + "  value=" + newValue+msg); //$NON-NLS-1$ //$NON-NLS-2$
-		return newValue;
-	}
-
-
-	/**
-	 * Add an include path for C compiling to the existing include paths of the given
-	 * Configuration.  XLC is handled as a special case to find its include path option;
-	 * for other tools, we assume there is a single option for include paths, so we take
-	 * the first one.
-	 * 
-	 * @param cf
-	 *            the configuration of the project (e.g. Release, Debug, etc.)
-	 * @param newIncludePath
-	 *            include path(s) to add.  If more than one, separate by
-	 *            java.io.File.pathSeparator, which is semicolon for Windows, colon for Mac/Linux
-	 */
-	protected void addIncludePath(IConfiguration cf, String newIncludePath) {
-		// note: could be > 1 path in 'newIncludePath'
-		String ext = "c"; //$NON-NLS-1$
-		ITool cfTool = cf.getToolFromInputExtension(ext);
-
-		//String id = cfTool.getId(); // "cdt.managedbuild.tool.xlc.c.compiler.exe.debug.1423270745"
-		String name = cfTool.getName();// "XL C Compiler"
-		IOption option = null;
-		if (name.startsWith("XL C")) { // special case for XL C compiler //$NON-NLS-1$
-			option = cfTool.getOptionById("xlc.c.compiler.option.include.paths"); //$NON-NLS-1$
-		} else { // otherwise we assume there is only one include path option.
-			option = getFirstOptionByType(cf, cfTool, IOption.INCLUDE_PATH);
-		}
-		if (option != null) {
-			String[] includePaths = null;
-			try {
-				includePaths = option.getIncludePaths();
-			} catch (BuildException e) {
-				e.printStackTrace();
-			}
-			String[] newIncludePaths = add(includePaths, newIncludePath);
-			if (traceOn)
-				System.out.println("        add " + newIncludePath + " to existing includePaths: " //$NON-NLS-1$ //$NON-NLS-2$
-						+ unroll(includePaths));
-			ManagedBuildManager.setOption(cf, cfTool, option, newIncludePaths);
-		}
-		else{
-			System.out.println("MPIProjectProcess, no option for include paths found."); //$NON-NLS-1$
-		}
-	}
-
-
-	/**
-	 * Add a new linker option.  Assumes that there is ONE instance of an option
-	 * of type <code>IOption.LIBRARY_PATHS</code> and <code>IOption.LIBRARIES</code>.
-	 * This method adds the libName and libPath to these two options.
-	 * @param cf the Configuration to which we want to add to linker options
-	 * @param libName the lib name (e.g. "lib")
-	 * @param libPath the library search path name (e.g. "c:/mypath/lib")
-	 * 
-	 */
-	protected void addLinkerOpt(IConfiguration cf, String libName, String libPath) {
-		String ext = "o"; //$NON-NLS-1$
-		ITool cfTool = cf.getToolFromInputExtension(ext);
-		if(cfTool==null) {
-			MessageDialog.openWarning(null, Messages.MPIProjectProcess_unable_to_set_linker_opt, Messages.MPIProjectProcess_unable_to_set_linker_opt_toolchain_invalid_q);
-			return;
-		}
-		IOption lpOpt = getFirstOptionByType(cf, cfTool, IOption.LIBRARY_PATHS);
-		addOptionValue(cf, cfTool, lpOpt, libPath);
-
-		IOption libOpt = getFirstOptionByType(cf, cfTool, IOption.LIBRARIES);
-		addOptionValue(cf, cfTool, libOpt, libName);
-	}                                                                                                                     
-
-	
-	protected void setCompileCommand(IConfiguration cf, String buildCmd) {
-		if(traceOn)System.out.println("compile cmd: "+buildCmd); //$NON-NLS-1$
-		ITool compiler = cf.getToolFromInputExtension("c"); //$NON-NLS-1$
-		compiler.setToolCommand(buildCmd);
-	}
-	
-	protected void setLinkCommand(IConfiguration cf, String buildCmd) {
-		if(traceOn)System.out.println("link cmd: "+buildCmd); //$NON-NLS-1$
-		ITool linker=cf.getToolFromInputExtension("o"); //$NON-NLS-1$
-		if(linker==null) {
-			MessageDialog.openWarning(null, Messages.MPIProjectProcess_unable_to_set_link_command, Messages.MPIProjectProcess_unable_to_set_link_command_toolchain_invalid_q);
-			return;
-		}
-		linker.setToolCommand(buildCmd);
-		
-	}
-	
-	/**
-	 * Add a value to a multi-valued tool option<br>
-	 * (For example, add a path to include paths, or a lib to libraries list)
-	 * @param cf the Configuration
-	 * @param tool the tool in which to update the option
-	 * @param option the option to update 
-	 * @param value the new value to add to the list of existing values in the option
-	 */
-	protected void addOptionValue(IConfiguration cf, ITool tool, IOption option, String value) {
-		try {
-			int type = option.getValueType();
-			String[] valueList = null;
-			switch (type) {
-			case IOption.INCLUDE_PATH:
-				valueList = option.getIncludePaths();
-				valueList = add(valueList,value);
-				break;
-			case IOption.LIBRARIES:
-				valueList = option.getLibraries();
-				valueList=addNotPath(valueList, value);
-				break;
-			case IOption.LIBRARY_PATHS:// this is type for library search path cdt 4.0 
-				valueList=option.getBasicStringListValue();
-				valueList=addNotPath(valueList,value);
-				break;
-			
-			default:
-				System.out.println("MPIProjectWizard Process postprocessing (MPIProjectProcess), can't get type of option for " + option.getName()); //$NON-NLS-1$
-				return;
-			}
-			// update the option in the managed builder options
-			ManagedBuildManager.setOption(cf, tool, option, valueList);
-
-		} catch (BuildException e) {
-			System.out.println("MPIProjectProcess.addOptionValue(), "+e.getMessage()); //$NON-NLS-1$
-			System.out.println(e.getMessage());
-			e.printStackTrace();
-		}
-
-	}
-
-	/**
-	 * Print the options for a project.<br>
-	 * e.g. for Debug and Release configurations, get all the tools (compiler, linker etc.) then for each tool, 
-	 * get all the options and print them.
-	 * 
-	 * IResource resource= ... ;// can be any resource, I use project.
-     * IManagedBuildInfo mbo = ManagedBuildManager.getBuildInfo(resource);
-     * IManagedProject mp=mbo.getManagedProject();
-	 * <br>
-	 * This helps in figuring out what they are, and what you want to change.
-	 * Some sample output is at the bottom of this file.
-	 * 
-	 * @param proj the (managed) project for which print all this stuff.
-	 */
-	protected void showOptions(IManagedProject proj) {
-		if(traceOn)System.out.println("Managed Project: "+proj.getName()); //$NON-NLS-1$
-		if(traceOn)System.out.println("Path.SEPARATOR="+Path.SEPARATOR); //$NON-NLS-1$
-		if(traceOn)System.out.println("Path.DEVICE_SEPARATOR="+Path.DEVICE_SEPARATOR); //$NON-NLS-1$
-		IConfiguration[] configs = proj.getConfigurations();
-		try {
-			for (int i = 0; i < configs.length; i++) {
-				IConfiguration cf = configs[i];
-				ITool[] allTools = cf.getTools();
-
-				int numTools = allTools.length;
-				System.out.println("Config " + i + ": " + cf.getName()+ " has "+numTools+" tools."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-
-				for (int k = 0; k < allTools.length; k++) {
-					ITool tool = allTools[k];
-					System.out.println("  Tool " + k + ": " + tool.getName()); //$NON-NLS-1$ //$NON-NLS-2$
-					//boolean rc=tool.setToolCommand("foo");
-					String toolCmd=tool.getToolCommand();
-					String toolID=tool.getId();
-					System.out.println("  cmd="+toolCmd+"  toolID="+toolID); //$NON-NLS-1$ //$NON-NLS-2$
-					
-					
-					IOption[] options = tool.getOptions();
-
-					for (int j = 0; j < options.length; j++) {
-						IOption opt = options[j];
-						String foundOptionID = opt.getId();
-						int type=opt.getValueType();
-						System.out.println("    option " + j + " " + opt.getName() + " id=" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-								+ foundOptionID+"  type="+showType(type)); //$NON-NLS-1$
-						if(opt.getValueType()==IOption.INCLUDE_PATH) {
-							showIncludePaths(opt);
-						}
-					}
-				}
-
-				System.out.println("Config " + i + ": " + cf.getName() //$NON-NLS-1$ //$NON-NLS-2$
-						+ "======= End of ALL tools "); //$NON-NLS-1$
-				
-				// another way to access Tool
-				String ext = "c"; //$NON-NLS-1$
-				ITool cfTool = cf.getToolFromInputExtension(ext);
-				System.out.println("Tool by ext: " + ext + " is: " + cfTool.getName()); //$NON-NLS-1$ //$NON-NLS-2$
-				
-				// Look for include path
-				IOption option = getFirstOptionByType(cf, cfTool, IOption.INCLUDE_PATH);
-				if (option != null) {
-					String oname = option.getName();
-					System.out.println("Option " + option.getId() + " is " + oname); //$NON-NLS-1$ //$NON-NLS-2$
-					showIncludePaths(option);
-				}
-				else System.out.println("No include path option found. "); //$NON-NLS-1$
-
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-	}
-	protected String showType(int type){
-		if(type==IOption.INCLUDE_PATH) return type+" (IOption.INCLUDE_PATH)"; //$NON-NLS-1$
-		if(type==IOption.LIBRARY_PATHS) return type+" (IOption.LIBRARY_PATHS)"; //$NON-NLS-1$
-		if(type==IOption.LIBRARIES)     return type+" (IOption.LIBRARIES)"; //$NON-NLS-1$
-		return type+" "; //$NON-NLS-1$
-	}
-
-	/**
-	 * Display the list of include paths in an option which is presumed
-	 * to be the include paths option.
-	 * @param opt
-	 * @throws BuildException
-	 */
-	protected void showIncludePaths(IOption opt) throws BuildException {
-		assert opt.getValueType() == IOption.INCLUDE_PATH ;
-		// if the option is a list of include paths, display them.
-		String[] includePaths = opt.getIncludePaths();
-		for (int index = 0; index < includePaths.length; index++) {
-			String path = includePaths[index];
-			System.out.println("   include path " + index + ": " + path); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-	}
-
-	/**
-	 * Add one or more paths to the list of paths
-	 * 
-	 * @param existingPaths the existing list of paths to add to
-	 * @param newPath the new path to add; may be >1 directory, with path delimiter java.io.File.pathSeparator 
-	 * (usually semicolon or colon)
-	 * @return the merged list
-	 */
-	protected String[] add(String[] existingPaths, String newPath) {
-		String pathSep=java.io.File.pathSeparator;  // semicolon for windows, colon for Mac/Linux
-		List<String> newPathList = new ArrayList<String>();
-		String path;
-		for (int i = 0; i < existingPaths.length; i++) {
-			path = existingPaths[i];
-			newPathList.add(path);
-		}
-		String[] newPathArray=newPath.split(pathSep);
-		for (int i = 0; i < newPathArray.length; i++) {
-			path = newPathArray[i];
-			newPathList.add(path);
-		}
-		
-		String[] newArray=(String[])newPathList.toArray(new String[0]);
-		return newArray;
-	}
-
-	/**
-	 * Add a single string to an array of strings
-	 * @param strList
-	 * @param newStr
-	 * @return
-	 */
-	protected String[] addNotPath(String[] strList, String newStr) {
-		int len = strList.length;
-		String newList[] = new String[len + 1];
-		System.arraycopy(strList, 0, newList, 0, len);
-		newList[len] = newStr;
-		return newList;
-	}
-	/**
-	 * Simple string representation of items in a string array
-	 * @param list
-	 * @return
-	 */
-	protected String unroll (String[] list){
-		StringBuffer result=new StringBuffer();
-		//list = new String[]{"one","two"};
-		//System.out.println(list);
-		for (int i = 0; i < list.length; i++) {
-			String string = list[i];
-			result.append(string);
-			result.append(", "); //$NON-NLS-1$
-		}
-		if (result.length() > 2) {
-			result.delete(result.length() - 2, result.length() - 1);
-		}
-		return result.toString();
-	}
-	/**
-	 * Get the options of a specific type.<br>
-	 * We really need an ITool.getOptionsByType(int) so we don't have to do
-	 * this.
-	 * 
-	 * @param cf
-	 *            the IConfiguration in which to search
-	 * @param cfTool
-	 *            the ITool whose options are being searched
-	 * @param optionType
-	 *            the option type we are looking for, e.g. IOption.SOMETHING
-	 * @return
-	 */
-	protected List<IOption> getOptionsByType(IConfiguration cf, ITool cfTool, int optionType) {
-
-		// run thru ALL options and check type for each, returning the ones that match
-		IOption[] allOptions = cfTool.getOptions();
-		List<IOption> foundOptions = new ArrayList<IOption>();
-
-		for (int i = 0; i < allOptions.length; i++) {
-			IOption option = allOptions[i];
-
-			int oType = 0;
-			try {
-				oType = option.getValueType();
-			} catch (BuildException e) {
-				e.printStackTrace();
-				continue;
-			}
-			if (optionType == oType) {
-				// add it to the list
-				foundOptions.add(option);
-			}
-
-		}
-		//IOption[] ret= foundOptions.toArray(new IOption[foundOptions.size()]);
-		return foundOptions;
-	}
-	/**
-	 * Returns the <i>first</i> option of the specified type from the tool
-	 * @param cf
-	 * @param cfTool
-	 * @param optionType
-	 * @return
-	 */
-	protected IOption getFirstOptionByType(IConfiguration cf, ITool cfTool, int optionType){
-		List<IOption> allOptions=getOptionsByType(cf,cfTool,optionType);
-		if(allOptions.size()>0){
-			return allOptions.get(0);
-		}
-		return null;
-	}
-}
-
-/**
- * 
- * Some sample tool data from showOptions() on Windows XP with cygwin Tool 1:
- * GCC C Compiler
- * <p>
- * 
- * option 0 Do not search system directories (-nostdinc)
- * id=gnu.c.compiler.option.preprocessor.nostdinc<br>
- * option 1 Preprocess only (-E)
- * id=gnu.c.compiler.option.preprocessor.preprocess<br>
- * option 2 Defined symbols (-D)
- * id=gnu.c.compiler.option.preprocessor.def.symbols<br>
- * option 3 Undefined symbols (-U)
- * id=gnu.c.compiler.option.preprocessor.undef.symbol<br>
- * option 4 Include paths (-I) id=gnu.c.compiler.option.include.paths<br>
- * option 5 Optimization Level
- * id=gnu.c.compiler.cygwin.exe.release.option.optimization.level<br>
- * option 6 Other optimization flags id=gnu.c.compiler.option.optimization.flags<br>
- * option 7 Debug Level
- * id=gnu.c.compiler.cygwin.exe.release.option.debugging.level<br>
- * option 8 Other debugging flags id=gnu.c.compiler.option.debugging.other<br>
- * option 9 Generate gprof information (-pg)
- * id=gnu.c.compiler.option.debugging.gprof<br>
- * option 10 Generate prof information (-p)
- * id=gnu.c.compiler.option.debugging.prof<br>
- * option 11 Check syntax only (-fsyntax-only)
- * id=gnu.c.compiler.option.warnings.syntax<br>
- * option 12 Pedantic (-pedantic) id=gnu.c.compiler.option.warnings.pedantic<br>
- * option 13 Pedantic warnings as errors (-pedantic-errors)
- * id=gnu.c.compiler.option.warnings.pedantic.error<br>
- * option 14 Inhibit all warnings (-w) id=gnu.c.compiler.option.warnings.nowarn<br>
- * option 15 All warnings (-Wall) id=gnu.c.compiler.option.warnings.allwarn<br>
- * option 16 Warnings as errors (-Werror)
- * id=gnu.c.compiler.option.warnings.toerrors<br>
- * option 17 Other flags id=gnu.c.compiler.option.misc.other<br>
- * option 18 Verbose (-v) id=gnu.c.compiler.option.misc.verbose<br>
- * option 19 Support ANSI programs (-ansi) id=gnu.c.compiler.option.misc.ansi<br>
- * 
- * Tool 2: GCC C Linker <br>
- * option 5 Libraries (-l) id=gnu.c.link.option.libs<br>
- * option 6 Library search path (-L) id=gnu.c.link.option.paths<br>
- * 
- */
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcessCPP.java b/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcessCPP.java
deleted file mode 100644
index 6a98683..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcessCPP.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corp. 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corp. - initial implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.wizards.wizardPages;
-
-import org.eclipse.cdt.managedbuilder.core.IConfiguration;
-import org.eclipse.cdt.managedbuilder.core.ITool;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ptp.pldt.mpi.core.MpiIDs;
-import org.eclipse.ptp.pldt.mpi.core.MpiPlugin;
-
-/**
- * 
- * After the MPIProjectWizardPageCPP runs, and we get MPI include path from the user,
- * we have this opportunity to use that information to modify the include paths, build cmds etc.
- * in the project
- * 
- * <p>This handles the special differences for C++ projects, over and above plain C projects.
- * 
- * @author Beth Tibbitts
- *
- */
-public class MPIProjectProcessCPP extends MPIProjectProcess {
-	
-	private static final boolean traceOn=false;
-
-	/**
-	 * Need to set both C and C++ build commands; the C++ build command is passed in as an arg.
-	 * The C build command was not solicited from the user on the wizard page, so we just
-	 * get the default value to use here.
-	 * <p>C++ projects use both a C build command and a C++ build command in their settings.
-	 */
-	protected void setCompileCommand(IConfiguration cf, String buildCmd) {
-		if(traceOn)System.out.println("compile cmd: "+buildCmd); //$NON-NLS-1$
-		// access the preference store from the MPI plugin so we can get c compiler too
-		IPreferenceStore preferenceStore = MpiPlugin.getDefault().getPreferenceStore();
-		String c_build_cmd = preferenceStore.getString(MpiIDs.MPI_BUILD_CMD);
-		
-		// 'buildCmd' arg we assume to be the same as cpp_build_cmd unless the user changed it in the wizard page, so we use that
-		// and so we don't use this
-		//String cpp_build_cmd = preferenceStore.getString(MpiIDs.MPI_CPP_BUILD_CMD);
-		
-		ITool c_compiler = cf.getToolFromInputExtension("c"); //$NON-NLS-1$
-		ITool cpp_compiler = cf.getToolFromInputExtension("cpp");	 //$NON-NLS-1$
-		
-		c_compiler.setToolCommand(c_build_cmd);
-		cpp_compiler.setToolCommand(buildCmd);
-		if(traceOn)System.out.println("C compiler cmd: "+c_build_cmd+"  C++ compiler cmd: "+buildCmd); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcessPages.java b/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcessPages.java
deleted file mode 100644
index f27778d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcessPages.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corp. 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corp. - initial implementation
- *********************************************************************************/
-
-package org.eclipse.ptp.pldt.wizards.wizardPages;
-import org.eclipse.cdt.ui.templateengine.IPagesAfterTemplateSelectionProvider;
-import org.eclipse.cdt.ui.templateengine.IWizardDataPage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWizard;
-
-/**
- * Wizard Pages for MPI C projects
- * @author Beth Tibbitts
- *
- */
-public class MPIProjectProcessPages implements IPagesAfterTemplateSelectionProvider {
-	IWizardDataPage[] pages;
-	
-	public IWizardDataPage[] createAdditionalPages(IWorkbenchWizard wizard,
-			IWorkbench workbench, IStructuredSelection selection) {
-		try {
-			pages= new IWizardDataPage[] {new MPIProjectWizardPageC()};
-			// TODO - log error
-		} catch(CoreException ce) {
-			pages= new IWizardDataPage[0];
-		}
-		return pages;
-	}
-
-	public IWizardDataPage[] getCreatedPages(IWorkbenchWizard wizard) {
-		return pages;
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcessPagesCPP.java b/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcessPagesCPP.java
deleted file mode 100644
index 08bb5bc..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectProcessPagesCPP.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corp. 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corp. - initial implementation
- *********************************************************************************/
-
-package org.eclipse.ptp.pldt.wizards.wizardPages;
-import org.eclipse.cdt.ui.templateengine.IPagesAfterTemplateSelectionProvider;
-import org.eclipse.cdt.ui.templateengine.IWizardDataPage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWizard;
-
-/**
- * Wizard Pages for MPI C++ projects as opposed to C projects
- * @author Beth Tibbitts
- *
- */
-public class MPIProjectProcessPagesCPP implements IPagesAfterTemplateSelectionProvider {
-	IWizardDataPage[] pages;
-	
-	public IWizardDataPage[] createAdditionalPages(IWorkbenchWizard wizard,
-			IWorkbench workbench, IStructuredSelection selection) {
-		try {
-			pages= new IWizardDataPage[] {new MPIProjectWizardPageCPP()};
-			// TODO - log error
-		} catch(CoreException ce) {
-			pages= new IWizardDataPage[0];
-		}
-		return pages;
-	}
-
-	public IWizardDataPage[] getCreatedPages(IWorkbenchWizard wizard) {
-		return pages;
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectWizardPage.java b/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectWizardPage.java
deleted file mode 100644
index 99225d7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectWizardPage.java
+++ /dev/null

@@ -1,727 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2010 IBM Corp. 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 Corp. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.wizards.wizardPages;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.preference.IPreferencePage;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.pldt.mpi.core.MpiIDs;
-import org.eclipse.ptp.pldt.mpi.core.MpiPlugin;
-import org.eclipse.ptp.pldt.mpi.core.prefs.MPIPreferencePage;
-import org.eclipse.ptp.pldt.wizards.messages.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Wizard Page for collecting info about MPI project - appended to end of
- * "C project" or "C++ project" wizard.
- * 
- * Abstract class encapsulates common behavior between C and C++ 
- * <p>
- * TODO remove dup code, share MPI&OpenMP version in a common class etc.
- * @author Beth Tibbitts
- * 
- */
-public abstract class MPIProjectWizardPage extends AbstractProjectWizardPage {
-	public static final String DOT = "."; //$NON-NLS-1$
-	private static final boolean traceOn=false;
-	public static final boolean wizardTraceOn=false;
-
-	private Composite composite;
-	public static final String PAGE_ID="org.eclipse.ptp.pldt.wizards.wizardPages.MPIProjectWizardPage"; //$NON-NLS-1$
-
-	// The following are IDs for storing info in MBSPageData so it can be retrieved in MpiProjectProcess (ProcessRunner)
-	// when the wizard is done.
-	/**
-	 * Store in MBSPageData  (with this ID) whether user wants to include MPI info in the project.
-	 */
-	public static final String DO_MPI_INCLUDES = "doMPIincludes"; //$NON-NLS-1$
-	/**
-	 * store in MBSPageData (with this ID) what the include path to MPI will be.
-	 */
-	public static final String INCLUDE_PATH_PROP_ID = "includePath"; //$NON-NLS-1$
-	/**
-	 * store in MBSPageData (with this ID) what the library name for the linker is.
-	 */
-	public static final String LIB_PROP_ID = "lib"; //$NON-NLS-1$
-	/**
-	 * store in MBSPageData (with this ID) what the library search path is.
-	 */
-	public static final String LIBRARY_SEARCH_PATH_PROP_ID = "libPath"; //$NON-NLS-1$
-	
-	public static final String MPI_COMPILE_COMMAND_PROP_ID = "mpiCompileCommand"; //$NON-NLS-1$
-	public static final String MPI_LINK_COMMAND_PROP_ID = "mpiLinkCommand"; //$NON-NLS-1$
-
-	private String currentMpiIncludePath;
-	private String currentLibName;
-	private String currentLibPath;
-	private String currentMpiCompileCommand;
-	private String currentMpiLinkCommand;
-
-	private String defaultMpiIncludePath;
-	private String defaultMpiLibName;
-	private String defaultMpiLibPath;
-	private String defaultMpiBuildCommand;
-	
-	private Text includePathField;
-	private Text libNameField;
-	private Text libPathField;
-	private Text mpiCompileCommandField, mpiLinkCommandField;
-	
-	private Label includePathLabel, libLabel, libPathLabel, mpiCompileCommandLabel, mpiLinkCommandLabel;
-
-	private Button browseButton;
-	private Button browseButton2;
-
-	private Button useDefaultsButton;
-	private Button useMpiProjectSettingsButton;
-	private static boolean defaultUseMpiIncludes=true;
-	
-	private Button mpiSampleButton;
-
-
-
-	private static final int SIZING_TEXT_FIELD_WIDTH = 250;
-	/**
-	 * By default we DO use MPI project settings in this project.<br>
-	 */
-	private boolean useMpiProjectSettings=true;
-	private String desc = Messages.MPIProjectWizardPage_mpi_project_page;
-	
-	public static final String MPI_PROJECT_TYPE_C="C"; //$NON-NLS-1$
-	public static final String MPI_PROJECT_TYPE_CPP="C++"; //$NON-NLS-1$
-	
-	/**
-	 * The CDT new project wizard page for MPI projects.  
-	 * Adds the include paths, library information, etc. for an MPI project.
-	 * @throws CoreException 
-	 * 
-	 */
-	public MPIProjectWizardPage() throws CoreException {
-		super(Messages.MPIProjectWizardPage_mpi_project_settings);
-		prefIDincludes=MpiIDs.MPI_INCLUDES;
-		if(wizardTraceOn)System.out.println("MPIProjectWizardPage().ctor..."); //$NON-NLS-1$
-
-		//CommonPlugin.log(IStatus.ERROR,"Test error");
-		//CommonPlugin.log(IStatus.WARNING,"Test warning");
-		
-		// access the preference store from the MPI plugin
-		preferenceStore = MpiPlugin.getDefault().getPreferenceStore();
-		boolean allowPrefixOnlyMatch = preferenceStore.getBoolean(MpiIDs.MPI_RECOGNIZE_APIS_BY_PREFIX_ALONE);
-		String mip=preferenceStore.getString(prefIDincludes);
-		if(traceOn)System.out.println("Got mpi include pref from other plugin: "+mip); //$NON-NLS-1$
-
-		// Set the defaults here in the wizard page constructor and just
-		// overwrite them if the user changes them.
-		defaultMpiIncludePath = mip;
-		// We only need to force MPI prefs to be set now if a prefix-only match isn't allowed.
-		// Note that if the user doesn't set include path, we can't make a guess at what the lib path etc is.
-		// However, this workaround (encourage setting of mpi include path) is used since mpi settings page
-		// in wizard dialog is blank if this value is not set.  
-		if( /*!allowPrefixOnlyMatch &&*/  defaultMpiIncludePath.length()==0) {
-			// warn if no MPI preferences have been set and allow user to set them right there
-			String newMip=showNoPrefs(Messages.MPIProjectWizardPage_mpi,prefIDincludes);
-			defaultMpiIncludePath=newMip;
-		}
-		setDefaultOtherNames(defaultMpiIncludePath);
-		// the following sets what will be remembered when we leave the page.
-		setCurrentMpiIncludePath(defaultMpiIncludePath);
-
-		// defaultMpiBuildCommand depends on project type (will be different for C vs C++ for example)
-		defaultMpiBuildCommand=getDefaultMpiBuildCommand();
-		setCurrentMpiCompileCommand(defaultMpiBuildCommand);
-		setCurrentMpiLinkCommand(defaultMpiBuildCommand);		
-	}
-
-	abstract protected String getDefaultMpiBuildCommand();
-
-	/**
-	 * Warn user that the MPI project preferences aren't set, and thus the new project wizard will not be very useful.
-	 * <br>
-	 */
-	private static boolean alreadyShown;
-	@SuppressWarnings("unused")
-	private static void showNoPrefs1() {
-		if(!alreadyShown) {
-			Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-			StringBuffer buf=new StringBuffer(Messages.MPIProjectWizardPage_no_mpi_preferences_set);
-			buf.append(Messages.MPIProjectWizardPage_default_project_setting_better_if_prefs_set);
-			buf.append(Messages.MPIProjectWizardPage_use_window_prefs_and_select_pldt);
-			buf.append(Messages.MPIProjectWizardPage_you_can_cancel_out_to_do_mpi_prefs);
-			MessageDialog.openWarning(shell, Messages.MPIProjectWizardPage_no_mpi_prefs_set, buf.toString());
-			alreadyShown= true;
-		}
-	}
-
-	/**
-	 * Set the default lib name and lib path based on what the 
-	 * include path is.  We assume something like
-	 * <code>mpiIncludepath=/my/path/include</code>
-	 * in which case we set
-	 * <code>libName="lib" </code>and <code> defaultMpiLibPath=/my/path/lib</code>.
-	 * <p>
-	 * Also, set the initial default values in the MBS page data,
-	 * so if user changes nothing on this page, the default values
-	 * will be picked up.
-	 * 
-	 * @param mpiIncludePath
-	 */
-	private void setDefaultOtherNames(String mpiIncludePath) {
-		defaultMpiLibName="mpi"; //$NON-NLS-1$
-		setCurrentMpiLibName(defaultMpiLibName);
-		
-		// if >1 path in mpi include path, use just the first
-		// one to guess at the libpath
-		String tempPath=mpiIncludePath;
-		int sepLoc=tempPath.indexOf(java.io.File.pathSeparatorChar);
-		if(-1!=sepLoc) {
-			tempPath=mpiIncludePath.substring(0, sepLoc);
-		}
-		// if no mpi include path, then don't bother to calculate
-		// a libpath based on it.
-		if (mpiIncludePath.length() > 0) { 
-			IPath path = Path.fromOSString(tempPath);
-			path = path.removeLastSegments(1);
-			path = path.addTrailingSeparator();
-			defaultMpiLibPath = path.toString() + "lib"; //$NON-NLS-1$
-			setCurrentMpiLibPath(defaultMpiLibPath);
-			// standardize format for mpi include path, too
-			path = Path.fromOSString(mpiIncludePath);
-			String temp = path.toString();
-			temp = stripTrailingSeparator(temp);
-			defaultMpiIncludePath = temp;
-			setCurrentMpiIncludePath(defaultMpiIncludePath);
-		}
-		else {
-			defaultMpiLibPath="";// must be non-null to set in text fields
-		}
-			
-		setCurrentMpiCompileCommand(defaultMpiBuildCommand);
-	}
-
-	/**
-	 * This sets what will be remembered for MPI include path when we leave the wizard page
-	 * (so we can retrieve the information from the ProcessRunner to actually do the change
-	 * to the project info)
-	 * 
-	 * @param path
-	 */
-	private void setCurrentMpiIncludePath(String path) {
-		currentMpiIncludePath = path;
-		pageData.put(PAGE_ID+DOT+INCLUDE_PATH_PROP_ID, path);
-	}
-	/**
-	 * This sets what will be remembered for library name when we leave the wizard page
-	 * (so we can retrieve the information from the ProcessRunner to actually do the change
-	 * to the project info)
-	 * 
-	 * @param path
-	 */
-	private void setCurrentMpiLibName(String name) {
-		//currentMpiIncludePath = name;//???
-		pageData.put(PAGE_ID+DOT+LIB_PROP_ID, name);
-	}
-	
-	Map<String, String> pageData= new HashMap<String, String>();
-	
-	/**
-	 * This sets what will be remembered for library search path when we leave the wizard page
-	 * (so we can retrieve the information from the ProcessRunner to actually do the change
-	 * to the project info)
-	 * 
-	 * @param path
-	 */
-	private void setCurrentMpiLibPath(String path) {
-		currentMpiIncludePath = path;
-		pageData.put(PAGE_ID+DOT+LIBRARY_SEARCH_PATH_PROP_ID, path);
-	}
-	private void setCurrentMpiCompileCommand(String buildCommand) {
-		currentMpiCompileCommand = buildCommand;
-		pageData.put(PAGE_ID+DOT+MPI_COMPILE_COMMAND_PROP_ID, buildCommand);
-	}
-	private void setCurrentMpiLinkCommand(String buildCommand) {
-		currentMpiLinkCommand = buildCommand;
-		pageData.put(PAGE_ID+DOT+MPI_LINK_COMMAND_PROP_ID, buildCommand);
-	}
-
-	public String getName() {
-		return new String(desc + " name"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Return the path in one of the path fields.
-	 * 
-	 * @return String
-	 */
-	private String getPathFromPathField(Text textField) {
-		URI fieldURI;
-		try {
-			fieldURI = new URI(textField.getText());
-		} catch (URISyntaxException e) {
-			return textField.getText();
-		}
-		return fieldURI.getPath();
-	}
-
-	/**
-	 * Update the include path field based on the selected path.
-	 * 
-	 * @param selectedPath
-	 */
-	private void updateIncludePathField(String selectedPath) {
-		if(traceOn)System.out.println("MPWP.updateLocationField to " + selectedPath); //$NON-NLS-1$
-		includePathField.setText(selectedPath);
-	}
-	/**
-	 * Update the lib path field based on the selected path.
-	 * 
-	 * @param selectedPath
-	 */
-	private void updateLibPathField(String selectedPath) {
-		if(traceOn)System.out.println("MPWP.updateLocationField to " + selectedPath); //$NON-NLS-1$
-		libPathField.setText(selectedPath);
-	}
-
-	/**
-	 * Open an appropriate directory browser and get selected directory <br>
-	 * TODO: can we use the dialog that CDT uses here? Allows direct typing.
-	 */
-	private void handleLocationBrowseButtonPressed() {
-
-		String selectedDirectory = null;
-		String dirName = getPathFromPathField(includePathField);
-
-		DirectoryDialog dialog = new DirectoryDialog(includePathField.getShell());
-		dialog.setMessage(Messages.MPIProjectWizardPage_mpi_include_path);
-
-		dialog.setFilterPath(dirName);
-
-		selectedDirectory = dialog.open();
-
-		if (selectedDirectory != null) {
-			updateIncludePathField(selectedDirectory);
-
-			includePathField.setText(selectedDirectory);
-			if(traceOn)System.out.println("Directory found via browse: " + selectedDirectory); //$NON-NLS-1$
-			// set value to where we can find it in the ProcessRunner later
-			setCurrentMpiIncludePath(selectedDirectory);
-		}
-	}
-	private void handleLocationBrowseButton2Pressed() {
-
-		String selectedDirectory = null;
-		String dirName = getPathFromPathField(libPathField);
-
-		DirectoryDialog dialog = new DirectoryDialog(libPathField.getShell());
-		dialog.setMessage(Messages.MPIProjectWizardPage_mpi_lib_search_path);
-
-		dialog.setFilterPath(dirName);
-
-		selectedDirectory = dialog.open();
-
-		if (selectedDirectory != null) {
-			updateLibPathField(selectedDirectory);
-
-			libPathField.setText(selectedDirectory);
-			if(traceOn)System.out.println("Directory found via browse: " + selectedDirectory); //$NON-NLS-1$
-			// set value to where we can find it in the ProcessRunner later
-			setCurrentMpiLibPath(selectedDirectory);
-		}
-	}
-
-	/**
-	 * Remove any trailing device separator characther (e.g. ; on windows or : on Linux)
-	 * @param str
-	 * @return the string without any trailing separator
-	 */
-	private String stripTrailingSeparator(String str) {
-		if(str.length()==0)return str;
-		char lastChar = str.charAt(str.length() - 1);
-		if (lastChar == java.io.File.pathSeparatorChar) {
-			String temp = str.substring(0, str.length() - 1);
-			return temp;
-		}
-		return str;
-
-	}
-
-	/**
-	 * Create the area in which the user can enter MPI include path and other information
-	 * 
-	 * @param composite to put it in
-	 * @param defaultEnabled indicates if the "use defaults" checkbox is to be initially selected.
-	 */
-	private void createUserEntryArea(Composite composite, boolean defaultEnabled) {
-		if(wizardTraceOn)System.out.println("MPIProjectWizardPage.createUserEntryArea() " ); //$NON-NLS-1$
-		
-		includePathLabel = new Label(composite, SWT.NONE);
-		includePathLabel.setText(Messages.MPIProjectWizardPage_include_path);
-		includePathLabel.setToolTipText(Messages.MPIProjectWizardPage_locn_of_mpi_incl_path);
-
-		// Include path location  entry field
-		includePathField = new Text(composite, SWT.BORDER);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.widthHint = SIZING_TEXT_FIELD_WIDTH;
-		data.horizontalSpan = 2;
-		includePathField.setLayoutData(data);
-		includePathField.setText(defaultMpiIncludePath);
-		includePathField.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				setCurrentMpiIncludePath(includePathField.getText());
-				if(traceOn)System.out.println("locationField.modifyText(): " + currentMpiIncludePath); //$NON-NLS-1$
-			}
-		});
-
-		// browse button
-		browseButton = new Button(composite, SWT.PUSH);
-		browseButton.setText(Messages.MPIProjectWizardPage_browse);
-		browseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				if(traceOn)System.out.println("Browse button pressed."); //$NON-NLS-1$
-				handleLocationBrowseButtonPressed();
-
-			}
-		});
-
-		// how do we know when next/finish button pushed? we don't.
-		// we just store all info where we can find it when the MPIProjectProcess (ProcessRunner) runs after all the wizard pages are done.
-		
-		libLabel=new Label(composite, SWT.NONE);
-		libLabel.setText(Messages.MPIProjectWizardPage_library_name);
-		libLabel.setToolTipText(Messages.MPIProjectWizardPage_library_name);
-		
-		libNameField=new Text(composite,SWT.BORDER);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.widthHint=SIZING_TEXT_FIELD_WIDTH;
-		gd.horizontalSpan=2;
-		libNameField.setLayoutData(gd);
-		if(defaultMpiLibName!=null) {
-			libNameField.setText(defaultMpiLibName);
-		}
-		libNameField.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				setCurrentMpiLibName(libNameField.getText());
-				if(traceOn)System.out.println("libNameField.modifyText(): " + currentLibName); //$NON-NLS-1$
-			}
-		});
-		
-		(new Label(composite,SWT.NONE)).setText(" ");//spacer //$NON-NLS-1$
-		
-		libPathLabel=new Label(composite, SWT.NONE);
-		libPathLabel.setText(Messages.MPIProjectWizardPage_library_search_path);
-		libPathLabel.setToolTipText(Messages.MPIProjectWizardPage_library_name);
-		
-		
-		libPathField=new Text(composite,SWT.BORDER);
-		GridData gd2 = new GridData(GridData.FILL_HORIZONTAL);
-		gd2.widthHint=SIZING_TEXT_FIELD_WIDTH;
-		gd2.horizontalSpan=2;
-		libPathField.setLayoutData(gd2);
-		if (defaultMpiLibPath != null) {
-			libPathField.setText(defaultMpiLibPath);// what if null? https://bugs.eclipse.org/bugs/show_bug.cgi?id=314927
-		}
-		libPathField.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				setCurrentMpiLibPath(libPathField.getText());
-				if (traceOn)
-					System.out.println("libPathField.modifyText(): " + currentLibPath); //$NON-NLS-1$
-			}
-		});
-		
-//		 browse button
-
-		browseButton2 = new Button(composite, SWT.PUSH);
-		browseButton2.setText(Messages.MPIProjectWizardPage_browse);
-		browseButton2.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				if(traceOn)System.out.println("Browse button pressed. DO SOMETHING HERE."); //$NON-NLS-1$
-				handleLocationBrowseButton2Pressed();
-
-			}
-		});
-		mpiCompileCommandLabel= new Label(composite,SWT.NONE);
-		mpiCompileCommandLabel.setText(Messages.MPIProjectWizardPage_mpi_compile_cmd);
-		mpiCompileCommandField=new Text(composite,SWT.BORDER);
-		GridData gd3 = new GridData(GridData.FILL_HORIZONTAL);
-		gd3.widthHint=SIZING_TEXT_FIELD_WIDTH;
-		gd3.horizontalSpan=2;
-		mpiCompileCommandField.setLayoutData(gd3);
-		mpiCompileCommandField.setText(defaultMpiBuildCommand);
-		mpiCompileCommandField.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				setCurrentMpiCompileCommand(mpiCompileCommandField.getText());
-				if(traceOn)System.out.println("mpiCompileCommandField.modifyText(): " + currentMpiCompileCommand); //$NON-NLS-1$
-			}
-		});
-		(new Label(composite,SWT.NONE)).setText(" ");//spacer //$NON-NLS-1$
-		
-		mpiLinkCommandLabel= new Label(composite,SWT.NONE);
-		mpiLinkCommandLabel.setText(Messages.MPIProjectWizardPage_mpi_link_cmd);
-		mpiLinkCommandField=new Text(composite,SWT.BORDER);
-		GridData gd4 = new GridData(GridData.FILL_HORIZONTAL);
-		gd4.widthHint=SIZING_TEXT_FIELD_WIDTH;
-		gd4.horizontalSpan=2;
-		mpiLinkCommandField.setLayoutData(gd3);
-		mpiLinkCommandField.setText(defaultMpiBuildCommand);
-		mpiLinkCommandField.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				setCurrentMpiLinkCommand(mpiLinkCommandField.getText());
-				if(traceOn)System.out.println("mpiLinkCommandField.modifyText(): " + currentMpiLinkCommand); //$NON-NLS-1$
-			}
-		});
-		(new Label(composite,SWT.NONE)).setText(" ");//spacer //$NON-NLS-1$
-
-		
-	}
-
-
-	/**
-	 * Create the contents of the wizard page.
-	 * 
-	 * @param composite parent composite in which these widgets will reside
-	 * 
-	 * @param defaultEnabled do we use default mpi include path?
-	 */
-	private void createContents(Composite composite, boolean defaultEnabled) {
-		int columns = 4;
-		Composite group = new Composite(composite, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = columns;
-		group.setLayout(layout);
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		useMpiProjectSettingsButton = new Button(group, SWT.CHECK | SWT.RIGHT);
-		useMpiProjectSettingsButton.setText(Messages.MPIProjectWizardPage_add_mpi_proj_settings_to_proj);
-		GridData gd=new GridData();
-		gd.horizontalSpan=columns;
-		useMpiProjectSettingsButton.setLayoutData(gd);
-		useMpiProjectSettingsButton.setSelection(useMpiProjectSettings);
-		useMpiProjectSettingsButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				useMpiProjectSettings = useMpiProjectSettingsButton.getSelection();
-				// set value so we can read it later
-				pageData.put(PAGE_ID+DOT+DO_MPI_INCLUDES, Boolean.toString(useMpiProjectSettings));
-				
-				useDefaultsButton.setEnabled(useMpiProjectSettings);
-				if(mpiSampleButton!=null)
-				   mpiSampleButton.setEnabled(useMpiProjectSettings);
-				if(useMpiProjectSettings) {
-				  boolean useDefaults=useDefaultsButton.getSelection();
-				  setUserAreaEnabled(!useDefaults);
-				}
-				
-				else
-					setUserAreaEnabled(false);
-				
-			}
-		});
-
-		useDefaultsButton = new Button(group, SWT.CHECK | SWT.RIGHT);
-		useDefaultsButton.setText(Messages.MPIProjectWizardPage_use_default_info);
-		useDefaultsButton.setSelection(defaultEnabled);
-		useDefaultsButton.setEnabled(useMpiProjectSettings);
-		GridData buttonData = new GridData();
-		buttonData.horizontalSpan = columns;
-		useDefaultsButton.setLayoutData(buttonData);
-		useDefaultsButton.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent e) {
-				boolean useDefaults = useDefaultsButton.getSelection();
-
-				if (useDefaults) { 
-					// reset all fields and values back to the defaults
-					includePathField.setText(defaultMpiIncludePath);
-					setCurrentMpiIncludePath(defaultMpiIncludePath);
-					
-					libPathField.setText(defaultMpiLibName);
-					setCurrentMpiLibName(defaultMpiLibName);
-					
-					libNameField.setText(defaultMpiLibName);
-					setCurrentMpiLibName(defaultMpiLibName);
-					
-					libPathField.setText(defaultMpiLibPath);
-					setCurrentMpiLibPath(defaultMpiLibPath);
-					
-					mpiCompileCommandField.setText(defaultMpiBuildCommand);
-					setCurrentMpiCompileCommand(defaultMpiBuildCommand);
-					
-					mpiLinkCommandField.setText(defaultMpiBuildCommand);
-					setCurrentMpiLinkCommand(defaultMpiBuildCommand);
-				}
-				setUserAreaEnabled(!useDefaults);
-			}
-		});
-
-		createUserEntryArea(group, defaultEnabled);
-		setUserAreaEnabled(!defaultEnabled);
-	}
-
-	public void createControl(Composite parent) {
-
-		composite = new Composite(parent, SWT.NULL);
-		composite.setLayout(new GridLayout());
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		boolean defaultEnabled = true;
-		createContents(composite, defaultEnabled);
-	}
-
-	public Control getControl() {
-		return composite;
-	}
-
-	public String getDescription() {
-		String tmp=Messages.MPIProjectWizardPage_select_mpi_incl_path_libname_and_etc;
-		return tmp;
-	}
-
-	public String getErrorMessage() {
-		return null;
-	}
-
-	public Image getImage() {
-		return getWizard().getDefaultPageImage();
-	}
-
-	public String getMessage() {
-		return null;
-	}
-
-	public String getTitle() {
-		return Messages.MPIProjectWizardPage_mpi_project_settings;
-	}
-
-	public void performHelp() {
-		// do nothing
-
-	}
-
-	public void setDescription(String description) {
-		// do nothing
-
-	}
-
-	public void setImageDescriptor(ImageDescriptor image) {
-		// do nothing
-
-	}
-
-	public void setTitle(String title) {
-		// do nothing
-
-	}
-
-	/**
-	 * If you need to init data/widgets on the page when it is displayed based
-	 * on the data set in previous pages, you can override
-	 * IDialogPage.setVisible(boolean visible) and setup everything when visible ==
-	 * true.
-	 * 
-	 * Otherwise, do inits in the ctor.
-	 */
-	public void setVisible(boolean visible) {
-		composite.setVisible(visible);
-		if(traceOn)System.out.println("MPIProjectWizardPage.setVisible: " + visible); //$NON-NLS-1$
-
-	}
-
-	/**
-	 * Determines the status of the wizard's finish button. If we don't want the
-	 * user to press finish yet, set this to false. <br>
-	 * The Next/Finish/Cancel methods belong to the wizard itself and not the
-	 * pages.
-	 * 
-	 * @return boolean true if finish button should be enabled; false otherwise.
-	 */
-	protected boolean isCustomPageComplete() {
-		// BRT if isDefaults is not checked then includePathField etc. should be
-		// filled in.
-		// BRT if isDefaults is checked then there should actually BE some
-		// defaults to use.
-		return true;
-	}
-
-	/**
-	 * Enable/disable "user area" which is the place user can type and make
-	 * changes (includePathField, its label and button, etc.)
-	 * 
-	 * @param enabled
-	 */
-	private void setUserAreaEnabled(boolean enabled) {
-		
-		includePathField.setEnabled(enabled);
-		browseButton.setEnabled(enabled);
-		browseButton2.setEnabled(enabled);
-		libNameField.setEnabled(enabled);
-		libPathField.setEnabled(enabled);
-		
-		includePathLabel.setEnabled(enabled);
-		libPathLabel.setEnabled(enabled);
-		libLabel.setEnabled(enabled);
-		
-		mpiCompileCommandLabel.setEnabled(enabled);
-		mpiCompileCommandField.setEnabled(enabled);
-		mpiLinkCommandLabel.setEnabled(enabled);
-		mpiLinkCommandField.setEnabled(enabled);
-	}
-	
-	/**
-	 * What's the default, do we include MPI includes or not?
-	 * If there is any difficulty getting information, use this default
-	 * setting.
-	 * @return
-	 */
-	public static boolean getDefaultUseMpiIncludes() {
-		return defaultUseMpiIncludes;
-	}
-
-	public Map<String,String> getPageData() {
-		return pageData;
-	}
-	
-	/**
-	 * Determines whether we are in a C or C++ project template
-	 * @return
-	 */
-	abstract protected String getMpiProjectType();
-	
-	@Override
-	protected IPreferencePage getPreferencePage() {
-		if(preferencePage == null) {
-			preferencePage = new MPIPreferencePage();
-		}
-		return preferencePage;
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectWizardPageC.java b/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectWizardPageC.java
deleted file mode 100644
index 274d2e0..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectWizardPageC.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006,2010 IBM Corp. 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 Corp. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.wizards.wizardPages;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.pldt.mpi.core.MpiIDs;
-
-
-/**
- * Wizard Page for collecting info about MPI C project - specifics for C vs C++
- * 
- * @author Beth Tibbitts
- * 
- */
-public class MPIProjectWizardPageC extends MPIProjectWizardPage {
-
-	public MPIProjectWizardPageC() throws CoreException {
-		super();
-	}
-
-	@Override
-	protected String getMpiProjectType() {
-		return MPI_PROJECT_TYPE_C;
-	}
-
-	@Override
-	protected String getDefaultMpiBuildCommand() {
-		String cmd = preferenceStore.getString(MpiIDs.MPI_BUILD_CMD);
-		return cmd;
-	}
-	
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectWizardPageCPP.java b/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectWizardPageCPP.java
deleted file mode 100644
index 0c62ead..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/MPIProjectWizardPageCPP.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006,2008 IBM Corp. 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 Corp. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.wizards.wizardPages;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.pldt.mpi.core.MpiIDs;
-
-
-/**
- * Wizard Page for collecting info about MPI C++ project 
- * 
- * @author Beth Tibbitts
- * 
- */
-public class MPIProjectWizardPageCPP extends MPIProjectWizardPage {
-
-	public MPIProjectWizardPageCPP() throws CoreException {
-		super();
-	}
-
-	@Override
-	protected String getMpiProjectType() {
-		return MPI_PROJECT_TYPE_CPP;
-	}
-	
-	@Override
-	protected String getDefaultMpiBuildCommand() {
-		String cmd = preferenceStore.getString(MpiIDs.MPI_CPP_BUILD_CMD);
-		return cmd;
-	}
-	
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/OpenMPProjectProcess.java b/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/OpenMPProjectProcess.java
deleted file mode 100644
index 8e58827..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/OpenMPProjectProcess.java
+++ /dev/null

@@ -1,550 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006,2010 IBM Corp. 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corp. - initial implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.wizards.wizardPages;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.cdt.core.templateengine.TemplateCore;
-import org.eclipse.cdt.core.templateengine.process.ProcessArgument;
-import org.eclipse.cdt.core.templateengine.process.ProcessFailureException;
-import org.eclipse.cdt.core.templateengine.process.ProcessRunner;
-import org.eclipse.cdt.managedbuilder.core.BuildException;
-import org.eclipse.cdt.managedbuilder.core.IConfiguration;
-import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
-import org.eclipse.cdt.managedbuilder.core.IManagedProject;
-import org.eclipse.cdt.managedbuilder.core.IOption;
-import org.eclipse.cdt.managedbuilder.core.ITool;
-import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.ptp.pldt.wizards.MpiWizardsPlugin;
-
-/**
- * 
- * After the MPIProjectWizardPage runs, and we get MPI include path from the user,
- * we have this opportunity to use that information to modify the include paths etc.
- * in the project
- * 
- * 
- * @author Beth Tibbitts
- *
- */
-public class OpenMPProjectProcess extends ProcessRunner {
-	private static final boolean traceOn=false;
-	private boolean wizTraceOn=OpenMPProjectWizardPage.wizardTraceOn;
-
-	private Map<String,String> valueStore;
-	
-	@Override
-	public void process(TemplateCore template, ProcessArgument[] args,
-			String processId, IProgressMonitor monitor)
-			throws ProcessFailureException {
-		if(wizTraceOn)System.out.println("OpenMPProjectProcess().run()..."); //$NON-NLS-1$
-		
-		valueStore= template.getValueStore();
-		String pageID = OpenMPProjectWizardPage.PAGE_ID;
-		
-		Object obj = getNewPropValue(pageID, OpenMPProjectWizardPage.DO_OpenMP_INCLUDES, null);
-		boolean doOpenMPIncludes = OpenMPProjectWizardPage.getDefaultUseOpenMPIncludes();
-		if (obj != null)
-			doOpenMPIncludes = Boolean.valueOf((String) obj);
-		if (!doOpenMPIncludes) {
-			if (traceOn)
-				System.out.println("Do not save OpenMP info in this project."); //$NON-NLS-1$
-			return;
-		}
- 		// this process must be executed after a separate process which creates the project
-		IProject proj= ResourcesPlugin.getWorkspace().getRoot().getProject(valueStore.get("projectName")); //$NON-NLS-1$
-		if(!proj.exists()) {
-			System.out.println("Project does not exist");//$NON-NLS-1$
-			return;	
-		}
-
-		if(traceOn)System.out.println("project: " + proj.getName());//$NON-NLS-1$
-
-		// Collect the values that the user entered on the wizard page
-		String propID = OpenMPProjectWizardPage.INCLUDE_PATH_PROP_ID;
-		String newIncludePath = getNewPropValue(pageID, propID,"c:/openmp/include"); //$NON-NLS-1$
-		if(traceOn)System.out.println("Got prop: "+propID+"="+newIncludePath); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		propID = OpenMPProjectWizardPage.LIB_PROP_ID;
-		String newLib=getNewPropValue(pageID,propID,"lib"); //$NON-NLS-1$
-		
-		propID=OpenMPProjectWizardPage.LIBRARY_SEARCH_PATH_PROP_ID;
-		String newLibSearchPath=getNewPropValue(pageID,propID,"c:/openmp/lib"); //$NON-NLS-1$
-		
-		propID=OpenMPProjectWizardPage.OpenMP_COMPILE_COMMAND_PROP_ID;
-		String OpenMPCompileCommand=getNewPropValue(pageID,propID,"gcc"); //$NON-NLS-1$
-		
-		propID=OpenMPProjectWizardPage.OpenMP_LINK_COMMAND_PROP_ID;    
-		String OpenMPLinkCommand=getNewPropValue(pageID,propID,"gcc"); //$NON-NLS-1$
-		
-		IManagedBuildInfo info = null;
-		try {
-			info = ManagedBuildManager.getBuildInfo(proj);
-			// note: assumed null if this is not a managed build project? will we get here in that case?
-			if(traceOn)System.out.println("Build info: " + info); //$NON-NLS-1$
-		} catch (Exception e) {
-			System.out.println("OpenMPProjectProcess.run(), "+e.getMessage()); //$NON-NLS-1$
-			e.printStackTrace();
-			return;
-		}
-		assert(info!=null);
-		
-		IManagedProject mProj = info.getManagedProject();
-		if(traceOn)showOptions(mProj);
-		
-		// add the include path & linker values to all the configurations
-		IConfiguration[] configs = mProj.getConfigurations();
-		for (int i = 0; i < configs.length; i++) {
-			IConfiguration cf = configs[i];
-			if(traceOn)System.out.println("Config " + i + ": " + cf.getName()); //$NON-NLS-1$ //$NON-NLS-2$
-			addIncludePath(cf, newIncludePath);
-			// 11/24/09: do not set linker lib, -fopenmp command does it all
-			//addLinkerOpt(cf,newLib,newLibSearchPath);
-			setCompileCommand(cf,OpenMPCompileCommand);
-			setLinkCommand(cf,OpenMPLinkCommand);		
-		}
-		if(traceOn)System.out.println("OpenMPProjectProcess, newIncludePath: "+newIncludePath); //$NON-NLS-1$
-		if(traceOn)System.out.println("   newLib: "+newLib+"  newLibSrchPth: "+newLibSearchPath); //$NON-NLS-1$ //$NON-NLS-2$
-		if(traceOn)System.out.println("   compileCmd: "+OpenMPCompileCommand); //$NON-NLS-1$
-		if(traceOn)System.out.println("   linkCmd: "+OpenMPLinkCommand); //$NON-NLS-1$
-		// ManagedBuildManger.saveBuildInfo(...) assures that the
-		// values are persisted in the build model, otherwise they will
-		// be lost when you shut down Eclipse.
-		if(traceOn)System.out.println("ManagedBuildManager.saveBuildInfo..."); //$NON-NLS-1$
-	
-		ManagedBuildManager.saveBuildInfo(proj, true);
-
-	}
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = MpiWizardsPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Get a value that was possibly obtained from the user on the associated wizard page.
-	 * @param pageID The pageID for our wizard page
-	 * @param propID The propID of the value we want
-	 * @param defaultVal The default value to use if the user didn't select anything,
-	 * or if we haven't gotten around to LETTING the user select anything yet.
-	 * @return
-	 */
-	private String getNewPropValue(String pageID, String propID, String defaultVal) {
-		Object obj = valueStore.get(pageID+MPIProjectWizardPage.DOT+propID);
-		// if selection made on page, obj is non-null.
-		String newValue = defaultVal;
-		String msg=" ( used default value)"; //$NON-NLS-1$
-		if (obj != null) {
-			newValue = obj.toString();
-			msg=""; //$NON-NLS-1$
-		}
-		if(traceOn)System.out.println("propID=" + propID + "  value=" + newValue+msg); //$NON-NLS-1$ //$NON-NLS-2$
-		return newValue;
-	}
-
-
-	/**
-	 * Add an include path for C compiling to the existing include paths of the given
-	 * Configuration.  XLC is handled as a special case to find its include path option;
-	 * for other tools, we assume there is a single option for include paths, so we take
-	 * the first one.
-	 * 
-	 * @param cf
-	 *            the configuration of the project (e.g. Release, Debug, etc.)
-	 * @param newIncludePath
-	 *            include path(s) to add.  If more than one, separate by
-	 *            java.io.File.pathSeparator, which is semicolon for Windows, colon for Mac/Linux
-	 */
-	private void addIncludePath(IConfiguration cf, String newIncludePath) {
-		// note: could be > 1 path in 'newIncludePath'
-		String ext = "c"; //$NON-NLS-1$
-		ITool cfTool = cf.getToolFromInputExtension(ext);
-		// do we need to also handle c++ case as well?
-
-		//String id = cfTool.getId(); // "cdt.managedbuild.tool.xlc.c.compiler.exe.debug.1423270745"
-		String name = cfTool.getName();// "XL C Compiler"
-		IOption option = null;
-		if (name.startsWith("XL C")) { // special case for XL C compiler //$NON-NLS-1$
-			option = cfTool.getOptionById("xlc.c.compiler.option.include.paths"); //$NON-NLS-1$
-		} else { // otherwise we assume there is only one include path option.
-			option = getFirstOptionByType(cf, cfTool, IOption.INCLUDE_PATH);
-		}
-		if (option != null) {
-			String[] includePaths = null;
-			try {
-				includePaths = option.getIncludePaths();
-			} catch (BuildException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-			String[] newIncludePaths = add(includePaths, newIncludePath);
-			if (traceOn)
-				System.out.println("        add " + newIncludePath + " to existing includePaths: " //$NON-NLS-1$ //$NON-NLS-2$
-						+ unroll(includePaths));
-			ManagedBuildManager.setOption(cf, cfTool, option, newIncludePaths);
-		}
-		else{
-			System.out.println("MPIProjectProcess, no option for include paths found."); //$NON-NLS-1$
-		}
-	}
-
-
-	/**
-	 * Add a new linker option.  Assumes that there is ONE instance of an option
-	 * of type <code>IOption.LIBRARY_PATHS</code> and <code>IOption.LIBRARIES</code>.
-	 * This method adds the libName and libPath to these two options.
-	 * <br>
-	 *  11/24/09: do not set linker lib, -fopenmp command does it all; thus this method isn't used.
-	 * @param cf the Configuration to which we want to add to linker options
-	 * @param libName the lib name (e.g. "lib")
-	 * @param libPath the library search path name (e.g. "c:/mypath/lib")
-	 * 
-	 */
-	/*
-	private void addLinkerOpt(IConfiguration cf, String libName, String libPath) {
-		String ext = "o"; //$NON-NLS-1$
-		ITool cfTool = cf.getToolFromInputExtension(ext);
-
-		IOption lpOpt = getFirstOptionByType(cf, cfTool, IOption.LIBRARY_PATHS);
-		addOptionValue(cf, cfTool, lpOpt, libPath);
-
-		IOption libOpt = getFirstOptionByType(cf, cfTool, IOption.LIBRARIES);
-		addOptionValue(cf, cfTool, libOpt, libName);
-	}
-	*/                                                                                                                     
-
-	
-	private void setCompileCommand(IConfiguration cf, String buildCmd) {
-		if(traceOn)System.out.println("compile cmd: "+buildCmd); //$NON-NLS-1$
-		ITool compiler = cf.getToolFromInputExtension("c"); //$NON-NLS-1$
-		compiler.setToolCommand(buildCmd);
-		
-	}
-	private void setLinkCommand(IConfiguration cf, String buildCmd) {
-		if(traceOn)System.out.println("link cmd: "+buildCmd); //$NON-NLS-1$
-		ITool linker=cf.getToolFromInputExtension("o"); //$NON-NLS-1$
-		linker.setToolCommand(buildCmd);
-		
-	}
-	
-	/**
-	 * Add a value to a multi-valued tool option<br>
-	 * (For example, add a path to include paths, or a lib to libraries list)
-	 * @param cf the Configuration
-	 * @param tool the tool in which to update the option
-	 * @param option the option to update 
-	 * @param value the new value to add to the list of existing values in the option
-	 */
-	private void addOptionValue(IConfiguration cf, ITool tool, IOption option, String value) {
-		try {
-			int type = option.getValueType();
-			String[] valueList = null;
-			switch (type) {
-			case IOption.INCLUDE_PATH:
-				valueList = option.getIncludePaths();
-				valueList = add(valueList,value);
-				break;
-			case IOption.LIBRARIES:
-				valueList = option.getLibraries();
-				valueList=addNotPath(valueList, value);
-				break;
-			case IOption.LIBRARY_PATHS:// this is type for library search path cdt 4.0 
-				valueList=option.getBasicStringListValue();
-				valueList=addNotPath(valueList,value);
-				break;
-			
-			default:
-				System.out.println("OpenMPProjectWizard Process postprocessing (OpenMPProjectProcess), can't get type of option for " + option.getName()); //$NON-NLS-1$
-				return;
-			}
-			// update the option in the managed builder options
-			ManagedBuildManager.setOption(cf, tool, option, valueList);
-
-		} catch (BuildException e) {
-			System.out.println("OpenMPProjectProcess.addOptionValue(), "+e.getMessage()); //$NON-NLS-1$
-			System.out.println(e.getMessage());
-			e.printStackTrace();
-		}
-
-	}
-
-	/**
-	 * Print the options for a project.<br>
-	 * e.g. for Debug and Release configurations, get all the tools (compiler, linker etc.) then for each tool, 
-	 * get all the options and print them.
-	 * 
-	 * IResource resource= ... ;// can be any resource, I use project.
-     * IManagedBuildInfo mbo = ManagedBuildManager.getBuildInfo(resource);
-     * IManagedProject mp=mbo.getManagedProject();
-	 * <br>
-	 * This helps in figuring out what they are, and what you want to change.
-	 * Some sample output is at the bottom of this file.
-	 * 
-	 * @param proj the (managed) project for which print all this stuff.
-	 */
-	private void showOptions(IManagedProject proj) {
-		if(traceOn)System.out.println("Managed Project: "+proj.getName()); //$NON-NLS-1$
-		if(traceOn)System.out.println("Path.SEPARATOR="+Path.SEPARATOR); //$NON-NLS-1$
-		if(traceOn)System.out.println("Path.DEVICE_SEPARATOR="+Path.DEVICE_SEPARATOR); //$NON-NLS-1$
-		IConfiguration[] configs = proj.getConfigurations();
-		try {
-			for (int i = 0; i < configs.length; i++) {
-				IConfiguration cf = configs[i];
-				ITool[] allTools = cf.getTools();
-
-				int numTools = allTools.length;
-				System.out.println("Config " + i + ": " + cf.getName()+ " has "+numTools+" tools."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-
-				for (int k = 0; k < allTools.length; k++) {
-					ITool tool = allTools[k];
-					System.out.println("  Tool " + k + ": " + tool.getName()); //$NON-NLS-1$ //$NON-NLS-2$
-					//boolean rc=tool.setToolCommand("foo");
-					String toolCmd=tool.getToolCommand();
-					String toolID=tool.getId();
-					System.out.println("  cmd="+toolCmd+"  toolID="+toolID); //$NON-NLS-1$ //$NON-NLS-2$
-					
-					
-					IOption[] options = tool.getOptions();
-
-					for (int j = 0; j < options.length; j++) {
-						IOption opt = options[j];
-						String foundOptionID = opt.getId();
-						int type=opt.getValueType();
-						System.out.println("    option " + j + " " + opt.getName() + " id=" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-								+ foundOptionID+"  type="+showType(type)); //$NON-NLS-1$
-						if(opt.getValueType()==IOption.INCLUDE_PATH) {
-							showIncludePaths(opt);
-						}
-					}
-				}
-
-				System.out.println("Config " + i + ": " + cf.getName() //$NON-NLS-1$ //$NON-NLS-2$
-						+ "======= End of ALL tools "); //$NON-NLS-1$
-				
-				// another way to access Tool
-				String ext = "c"; //$NON-NLS-1$
-				ITool cfTool = cf.getToolFromInputExtension(ext);
-				System.out.println("Tool by ext: " + ext + " is: " + cfTool.getName()); //$NON-NLS-1$ //$NON-NLS-2$
-				
-				// Look for include path
-				IOption option = getFirstOptionByType(cf, cfTool, IOption.INCLUDE_PATH);
-				if (option != null) {
-					String oname = option.getName();
-					System.out.println("Option " + option.getId() + " is " + oname); //$NON-NLS-1$ //$NON-NLS-2$
-					showIncludePaths(option);
-				}
-				else System.out.println("No include path option found. "); //$NON-NLS-1$
-
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-	}
-	private String showType(int type){
-		if(type==IOption.INCLUDE_PATH) return type+" (IOption.INCLUDE_PATH)"; //$NON-NLS-1$
-		if(type==IOption.LIBRARY_PATHS) return type+" (IOption.LIBRARY_PATHS)"; //$NON-NLS-1$
-		if(type==IOption.LIBRARIES)     return type+" (IOption.LIBRARIES)"; //$NON-NLS-1$
-		return type+" "; //$NON-NLS-1$
-	}
-
-	/**
-	 * Display the list of include paths in an option which is presumed
-	 * to be the include paths option.
-	 * @param opt
-	 * @throws BuildException
-	 */
-	private void showIncludePaths(IOption opt) throws BuildException {
-		assert opt.getValueType() == IOption.INCLUDE_PATH ;
-		// if the option is a list of include paths, display them.
-		String[] includePaths = opt.getIncludePaths();
-		for (int index = 0; index < includePaths.length; index++) {
-			String path = includePaths[index];
-			System.out.println("   include path " + index + ": " + path); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-	}
-
-	/**
-	 * Add one or more paths to the list of paths
-	 * 
-	 * @param existingPaths the existing list of paths to add to
-	 * @param newPath the new path to add; may be >1 directory, with path delimiter java.io.File.pathSeparator 
-	 * (usually semicolon or colon)
-	 * @return the merged list
-	 */
-	private String[] add(String[] existingPaths, String newPath) {
-		String pathSep=java.io.File.pathSeparator;  // semicolon for windows, colon for Mac/Linux
-		List<String> newPathList = new ArrayList<String>();
-		String path;
-		for (int i = 0; i < existingPaths.length; i++) {
-			path = existingPaths[i];
-			newPathList.add(path);
-		}
-		String[] newPathArray=newPath.split(pathSep);
-		for (int i = 0; i < newPathArray.length; i++) {
-			path = newPathArray[i];
-			newPathList.add(path);
-		}
-		
-		String[] newArray=(String[])newPathList.toArray(new String[0]);
-		return newArray;
-		
-		/*
-
-		*/
-	}
-
-	/**
-	 * Add a single string to an array of strings
-	 * @param strList
-	 * @param newStr
-	 * @return
-	 */
-	private String[] addNotPath(String[] strList, String newStr) {
-		int len = strList.length;
-		String newList[] = new String[len + 1];
-		System.arraycopy(strList, 0, newList, 0, len);
-		newList[len] = newStr;
-		return newList;
-	}
-	/**
-	 * Simple string representation of items in a string array
-	 * @param list
-	 * @return
-	 */
-	private String unroll (String[] list){
-		StringBuffer result=new StringBuffer();
-		//list = new String[]{"one","two"};
-		//System.out.println(list);
-		for (int i = 0; i < list.length; i++) {
-			String string = list[i];
-			result.append(string);
-			result.append(", "); //$NON-NLS-1$
-			
-			
-		}
-		if (result.length() > 2) {
-			result.delete(result.length() - 2, result.length() - 1);
-		}
-		return result.toString();
-	}
-	/**
-	 * Get the options of a specific type.<br>
-	 * We really need an ITool.getOptionsByType(int) so we don't have to do
-	 * this.
-	 * 
-	 * @param cf
-	 *            the IConfiguration in which to search
-	 * @param cfTool
-	 *            the ITool whose options are being searched
-	 * @param optionType
-	 *            the option type we are looking for, e.g. IOption.SOMETHING
-	 * @return
-	 */
-	private List<IOption> getOptionsByType(IConfiguration cf, ITool cfTool, int optionType) {
-
-		// run thru ALL options and check type for each, returning the ones that match
-		IOption[] allOptions = cfTool.getOptions();
-		List<IOption> foundOptions = new ArrayList<IOption>();
-
-		for (int i = 0; i < allOptions.length; i++) {
-			IOption option = allOptions[i];
-
-			int oType = 0;
-			try {
-				oType = option.getValueType();
-			} catch (BuildException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-				continue;
-			}
-			if (optionType == oType) {
-				// add it to the list
-				foundOptions.add(option);
-			}
-
-		}
-		//IOption[] ret= foundOptions.toArray(new IOption[foundOptions.size()]);
-		return foundOptions;
-	}
-	/**
-	 * Returns the <i>first</i> option of the specified type from the tool
-	 * @param cf
-	 * @param cfTool
-	 * @param optionType
-	 * @return
-	 */
-	private IOption getFirstOptionByType(IConfiguration cf, ITool cfTool, int optionType){
-		List<IOption> allOptions=getOptionsByType(cf,cfTool,optionType);
-		if(allOptions.size()>0){
-			return allOptions.get(0);
-		}
-		return null;
-	}
-}
-
-/**
- * 
- * Some sample tool data from showOptions() on Windows XP with cygwin Tool 1:
- * GCC C Compiler
- * <p>
- * 
- * option 0 Do not search system directories (-nostdinc)
- * id=gnu.c.compiler.option.preprocessor.nostdinc<br>
- * option 1 Preprocess only (-E)
- * id=gnu.c.compiler.option.preprocessor.preprocess<br>
- * option 2 Defined symbols (-D)
- * id=gnu.c.compiler.option.preprocessor.def.symbols<br>
- * option 3 Undefined symbols (-U)
- * id=gnu.c.compiler.option.preprocessor.undef.symbol<br>
- * option 4 Include paths (-I) id=gnu.c.compiler.option.include.paths<br>
- * option 5 Optimization Level
- * id=gnu.c.compiler.cygwin.exe.release.option.optimization.level<br>
- * option 6 Other optimization flags id=gnu.c.compiler.option.optimization.flags<br>
- * option 7 Debug Level
- * id=gnu.c.compiler.cygwin.exe.release.option.debugging.level<br>
- * option 8 Other debugging flags id=gnu.c.compiler.option.debugging.other<br>
- * option 9 Generate gprof information (-pg)
- * id=gnu.c.compiler.option.debugging.gprof<br>
- * option 10 Generate prof information (-p)
- * id=gnu.c.compiler.option.debugging.prof<br>
- * option 11 Check syntax only (-fsyntax-only)
- * id=gnu.c.compiler.option.warnings.syntax<br>
- * option 12 Pedantic (-pedantic) id=gnu.c.compiler.option.warnings.pedantic<br>
- * option 13 Pedantic warnings as errors (-pedantic-errors)
- * id=gnu.c.compiler.option.warnings.pedantic.error<br>
- * option 14 Inhibit all warnings (-w) id=gnu.c.compiler.option.warnings.nowarn<br>
- * option 15 All warnings (-Wall) id=gnu.c.compiler.option.warnings.allwarn<br>
- * option 16 Warnings as errors (-Werror)
- * id=gnu.c.compiler.option.warnings.toerrors<br>
- * option 17 Other flags id=gnu.c.compiler.option.misc.other<br>
- * option 18 Verbose (-v) id=gnu.c.compiler.option.misc.verbose<br>
- * option 19 Support ANSI programs (-ansi) id=gnu.c.compiler.option.misc.ansi<br>
- * 
- * Tool 2: GCC C Linker <br>
- * option 5 Libraries (-l) id=gnu.c.link.option.libs<br>
- * option 6 Library search path (-L) id=gnu.c.link.option.paths<br>
- * 
- */
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/OpenMPProjectProcessPages.java b/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/OpenMPProjectProcessPages.java
deleted file mode 100644
index ea97d31..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/OpenMPProjectProcessPages.java
+++ /dev/null

@@ -1,37 +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.wizards.wizardPages;
-import org.eclipse.cdt.ui.templateengine.IPagesAfterTemplateSelectionProvider;
-import org.eclipse.cdt.ui.templateengine.IWizardDataPage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWizard;
-
-
-public class OpenMPProjectProcessPages implements IPagesAfterTemplateSelectionProvider {
-	IWizardDataPage[] pages;
-	
-	public IWizardDataPage[] createAdditionalPages(IWorkbenchWizard wizard,
-			IWorkbench workbench, IStructuredSelection selection) {
-		try {
-			pages= new IWizardDataPage[] {new OpenMPProjectWizardPage()};
-			// TODO - log error
-		} catch(CoreException ce) {
-			pages= new IWizardDataPage[0];
-		}
-		return pages;
-	}
-
-	public IWizardDataPage[] getCreatedPages(IWorkbenchWizard wizard) {
-		return pages;
-	}
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/OpenMPProjectWizardPage.java b/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/OpenMPProjectWizardPage.java
deleted file mode 100644
index 31789dc..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/src/org/eclipse/ptp/pldt/wizards/wizardPages/OpenMPProjectWizardPage.java
+++ /dev/null

@@ -1,727 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006,2010 IBM Corp. 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 Corp. - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.pldt.wizards.wizardPages;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.preference.IPreferencePage;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.pldt.openmp.core.OpenMPIDs;
-import org.eclipse.ptp.pldt.openmp.core.OpenMPPlugin;
-import org.eclipse.ptp.pldt.wizards.messages.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Wizard Page for collecting info about OpenMP project - appended to end of
- * "New  C project" wizard
- * 
- * TODO remove dup code, share with MPI version in a common class etc.
- * @author Beth Tibbitts
- * 
- */
-public class OpenMPProjectWizardPage extends AbstractProjectWizardPage {
-	public static final String DOT = "."; //$NON-NLS-1$
-	private static final boolean traceOn=false;
-	public static final boolean wizardTraceOn=false;
-
-	private Composite composite;
-	public static final String PAGE_ID="org.eclipse.ptp.pldt.wizards.wizardPages.OpenMPProjectWizardPage"; //$NON-NLS-1$
-
-	// The following are IDs for storing info in MBSPageData so it can be retrieved in OpenMPProjectProcess (ProcessRunner)
-	// when the wizard is done.
-	/**
-	 * Store in MBSPageData  (with this ID) whether user wants to include OpenMP info in the project.
-	 */
-	public static final String DO_OpenMP_INCLUDES = "doOpenMPincludes"; //$NON-NLS-1$
-	/**
-	 * store in MBSPageData (with this ID) what the include path to OpenMP will be.
-	 */
-	public static final String INCLUDE_PATH_PROP_ID = "includePath"; //$NON-NLS-1$
-	/**
-	 * store in MBSPageData (with this ID) what the library name for the linker is.
-	 */
-	public static final String LIB_PROP_ID = "lib"; //$NON-NLS-1$
-	/**
-	 * store in MBSPageData (with this ID) what the library search path is.
-	 */
-	public static final String LIBRARY_SEARCH_PATH_PROP_ID = "libPath"; //$NON-NLS-1$
-	
-	public static final String OpenMP_COMPILE_COMMAND_PROP_ID = "OpenMPCompileCommand"; //$NON-NLS-1$
-	public static final String OpenMP_LINK_COMMAND_PROP_ID = "OpenMPLinkCommand"; //$NON-NLS-1$
-
-	private String currentOpenMPIncludePath;
-	private String currentLibName;
-	private String currentLibPath;
-	private String currentOpenMPCompileCommand;
-	private String currentOpenMPLinkCommand;
-
-	private String defaultOpenMPIncludePath;
-	private String defaultOpenMPLibName;
-	private String defaultOpenMPLibPath;
-	private String defaultOpenMPBuildCommand;
-	
-	private Text includePathField;
-	private Text libNameField;
-	private Text libPathField;
-	private Text openMPCompileCommandField, openMPLinkCommandField;
-	
-	private Label includePathLabel, libLabel, libPathLabel, openMPCompileCommandLabel, openMPLinkCommandLabel;
-
-	private Button browseButton;
-	private Button browseButton2;
-
-	private Button useDefaultsButton;
-	private Button useOpenMPProjectSettingsButton;
-	private static boolean defaultUseOpenMPIncludes=true;
-	
-	private Button OpenMPSampleButton;
-
-	private static final int SIZING_TEXT_FIELD_WIDTH = 250;
-	/**
-	 * By default we DO use OpenMP project settings in a new project.<br>
-	 */
-	private boolean useOpenMPProjectSettings=true;
-	private String desc = Messages.OpenMPProjectWizardPage_openmp_project_page;
-	
-	/**
-	 * The CDT new project wizard page for OpenMP projects.  
-	 * Adds the include paths, library information, etc. for an MPI project.
-	 * @throws CoreException 
-	 * 
-	 */
-	public OpenMPProjectWizardPage() throws CoreException {
-		super(Messages.OpenMPProjectWizardPage_openmp_project_settings);
-		prefIDincludes=OpenMPIDs.OpenMP_INCLUDES;
-		if(wizardTraceOn)System.out.println("OpenMPProjectWizardPage().ctor..."); //$NON-NLS-1$
-
-		//CommonPlugin.log(IStatus.ERROR,"Test error");
-		//CommonPlugin.log(IStatus.WARNING,"Test warning");
-		
-		// access the preference store from the OpenMP plugin
-		preferenceStore = OpenMPPlugin.getDefault().getPreferenceStore();
-		String mip=preferenceStore.getString(prefIDincludes);
-		if(traceOn)System.out.println("Got OpenMP include pref from other plugin: "+mip); //$NON-NLS-1$
-
-		// Set the defaults here in the wizard page constructor and just
-		// overwrite them if the user changes them.
-		defaultOpenMPIncludePath = preferenceStore.getString(prefIDincludes);
-		if(defaultOpenMPIncludePath.length()==0) {
-			// warn if no OpenMP preferences have been set
-			String newIncludePath=showNoPrefs("OpenMP",prefIDincludes); //$NON-NLS-1$
-			defaultOpenMPIncludePath=newIncludePath;
-		}
-		setDefaultOtherNames(defaultOpenMPIncludePath);
-		// the following sets what will be remembered when we leave the page.
-		setCurrentOpenMPIncludePath(defaultOpenMPIncludePath);
-		
-		defaultOpenMPBuildCommand=preferenceStore.getString(OpenMPIDs.OpenMP_BUILD_CMD);
-		setCurrentOpenMPCompileCommand(defaultOpenMPBuildCommand);
-		setCurrentOpenMPLinkCommand(defaultOpenMPBuildCommand);		
-	}
-
-	/**
-	 * Warn user that the OpenMP project preferences aren't set, and thus the new project wizard will not be very useful.
-	 * <br>
-	 * TODO: do we need a "do not show this message again" setting? (af - yes please! ;)
-	 */
-	private static boolean alreadyShown;
-	@SuppressWarnings("unused")
-	private static void showNoPrefs1() {
-		if(!alreadyShown) {
-			Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-			StringBuffer buf=new StringBuffer(Messages.OpenMPProjectWizardPage_no_prefs_set);
-			buf.append(Messages.OpenMPProjectWizardPage_no_prefs_set_2);
-			buf.append(Messages.OpenMPProjectWizardPage_no_prefs_set_3);
-			buf.append(Messages.OpenMPProjectWizardPage_no_prefs_set_4);
-			MessageDialog.openWarning(shell, Messages.OpenMPProjectWizardPage_no_prefs_set_5, buf.toString());
-			alreadyShown= true;
-		}
-	}
-
-	/**
-	 * Set the default lib name and lib path based on what the 
-	 * include path is.  We assume something like
-	 * <code>openMPIncludepath=/my/path/include</code>
-	 * in which case we set
-	 * <code>libName="lib" </code>and <code> defaultOpenMPLibPath=/my/path/lib</code>.
-	 * <p>
-	 * Also, set the initial default values in the MBS page data,
-	 * so if user changes nothing on this page, the default values
-	 * will be picked up.
-	 * 
-	 * @param openMPincludePath
-	 */
-	private void setDefaultOtherNames(String openMPincludePath) {
-		defaultOpenMPLibName="";//"openmp"; //$NON-NLS-1$
-		setCurrentOpenMPLibName(defaultOpenMPLibName);
-		
-		// if >1 path in openmp include path, use just the first
-		// one to guess at the libpath
-		String tempPath=openMPincludePath;
-		int sepLoc=tempPath.indexOf(java.io.File.pathSeparatorChar);
-		if(-1!=sepLoc) {
-			tempPath=openMPincludePath.substring(0, sepLoc);
-		}
-		IPath path = Path.fromOSString(tempPath);
-		path=path.removeLastSegments(1);
-		path=path.addTrailingSeparator();
-
-		defaultOpenMPLibPath=""; // path.toString()+"lib";   // default is blank: -fopenmp option does it all //$NON-NLS-1$
-		//System.out.println("defaultOpenMPLibPath="+defaultOpenMPLibPath);
-		setCurrentOpenMPLibPath(defaultOpenMPLibPath);
-		
-		//standardize format for openmp include path, too
-		path = Path.fromOSString(openMPincludePath);
-		String temp=path.toString();
-		temp=stripTrailingSeparator(temp);
-		defaultOpenMPIncludePath=temp;
-		setCurrentOpenMPIncludePath(defaultOpenMPIncludePath);	
-			
-		setCurrentOpenMPCompileCommand(defaultOpenMPBuildCommand);
-	}
-
-	/**
-	 * This sets what will be remembered for OpenMP include path when we leave the wizard page
-	 * (so we can retrieve the information from the ProcessRunner to actually do the change
-	 * to the project info)
-	 * 
-	 * @param path
-	 */
-	private void setCurrentOpenMPIncludePath(String path) {
-		currentOpenMPIncludePath = path;
-		pageData.put(PAGE_ID+DOT+INCLUDE_PATH_PROP_ID, path);
-	}
-	/**
-	 * This sets what will be remembered for library name when we leave the wizard page
-	 * (so we can retrieve the information from the ProcessRunner to actually do the change
-	 * to the project info)
-	 * 
-	 * @param path
-	 */
-	private void setCurrentOpenMPLibName(String name) {
-		currentOpenMPIncludePath = name;
-		pageData.put(PAGE_ID+DOT+LIB_PROP_ID, name);
-	}
-	
-	Map<String, String> pageData= new HashMap<String, String>();
-	
-	/**
-	 * This sets what will be remembered for library search path when we leave the wizard page
-	 * (so we can retrieve the information from the ProcessRunner to actually do the change
-	 * to the project info)
-	 * 
-	 * @param path
-	 */
-	private void setCurrentOpenMPLibPath(String path) {
-		currentOpenMPIncludePath = path;
-		pageData.put(PAGE_ID+DOT+LIBRARY_SEARCH_PATH_PROP_ID, path);
-	}
-	private void setCurrentOpenMPCompileCommand(String buildCommand) {
-		currentOpenMPCompileCommand = buildCommand;
-		pageData.put(PAGE_ID+DOT+OpenMP_COMPILE_COMMAND_PROP_ID, buildCommand);
-	}
-	private void setCurrentOpenMPLinkCommand(String buildCommand) {
-		currentOpenMPLinkCommand = buildCommand;
-		pageData.put(PAGE_ID+DOT+OpenMP_LINK_COMMAND_PROP_ID, buildCommand);
-	}
-
-	public String getName() {
-		return new String(desc + " name"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Return the path in one of the path fields.
-	 * 
-	 * @return String
-	 */
-	private String getPathFromPathField(Text textField) {
-		URI fieldURI;
-		try {
-			fieldURI = new URI(textField.getText());
-		} catch (URISyntaxException e) {
-			return textField.getText();
-		}
-		return fieldURI.getPath();
-	}
-
-	/**
-	 * Update the include path field based on the selected path.
-	 * 
-	 * @param selectedPath
-	 */
-	private void updateIncludePathField(String selectedPath) {
-		if(traceOn)System.out.println("MPWP.updateLocationField to " + selectedPath); //$NON-NLS-1$
-		includePathField.setText(selectedPath);
-	}
-	/**
-	 * Update the lib path field based on the selected path.
-	 * 
-	 * @param selectedPath
-	 */
-	private void updateLibPathField(String selectedPath) {
-		if(traceOn)System.out.println("MPWP.updateLocationField to " + selectedPath); //$NON-NLS-1$
-		libPathField.setText(selectedPath);
-	}
-
-	/**
-	 * Open an appropriate directory browser and get selected directory <br>
-	 * TODO: can we use the dialog that CDT uses here? Allows direct typing.
-	 */
-	private void handleLocationBrowseButtonPressed() {
-
-		String selectedDirectory = null;
-		String dirName = getPathFromPathField(includePathField);
-
-		DirectoryDialog dialog = new DirectoryDialog(includePathField.getShell());
-		dialog.setMessage(Messages.OpenMPProjectWizardPage_openmp_include_path);
-
-		dialog.setFilterPath(dirName);
-
-		selectedDirectory = dialog.open();
-
-		if (selectedDirectory != null) {
-			updateIncludePathField(selectedDirectory);
-
-			includePathField.setText(selectedDirectory);
-			if(traceOn)System.out.println("Directory found via browse: " + selectedDirectory); //$NON-NLS-1$
-			// set value to where we can find it in the ProcessRunner later
-			setCurrentOpenMPIncludePath(selectedDirectory);
-		}
-	}
-	private void handleLocationBrowseButton2Pressed() {
-
-		String selectedDirectory = null;
-		String dirName = getPathFromPathField(libPathField);
-
-		DirectoryDialog dialog = new DirectoryDialog(libPathField.getShell());
-		dialog.setMessage(Messages.OpenMPProjectWizardPage_openp_library_search_path);
-
-		dialog.setFilterPath(dirName);
-
-		selectedDirectory = dialog.open();
-
-		if (selectedDirectory != null) {
-			updateLibPathField(selectedDirectory);
-
-			libPathField.setText(selectedDirectory);
-			if(traceOn)System.out.println("Directory found via browse: " + selectedDirectory); //$NON-NLS-1$
-			// set value to where we can find it in the ProcessRunner later
-			setCurrentOpenMPLibPath(selectedDirectory);
-		}
-	}
-
-	/**
-	 * Remove any trailing device separator characther (e.g. ; on windows or : on Linux)
-	 * @param str
-	 * @return the string without any trailing separator
-	 */
-	private String stripTrailingSeparator(String str) {
-		if(str.length()==0)return str;
-		char lastChar = str.charAt(str.length() - 1);
-		if (lastChar == java.io.File.pathSeparatorChar) {
-			String temp = str.substring(0, str.length() - 1);
-			return temp;
-		}
-		return str;
-
-	}
-
-	/**
-	 * Create the area in which the user can enter MPI include path and other information
-	 * 
-	 * @param composite to put it in
-	 * @param defaultEnabled indicates if the "use defaults" checkbox is to be initially selected.
-	 */
-	private void createUserEntryArea(Composite composite, boolean defaultEnabled) {
-		//?? err? causes things to happen in wrong order??   IProject project = this.getProject();
-		//String name = project.getName();
-		if(wizardTraceOn)System.out.println("OpenMPProjectWizardPage.createUserEntryArea() " ); //$NON-NLS-1$
-		
-		includePathLabel = new Label(composite, SWT.NONE);
-		includePathLabel.setText(Messages.OpenMPProjectWizardPage_include_path);
-		includePathLabel.setToolTipText(Messages.OpenMPProjectWizardPage_include_path_tooltip);
-
-		// Include path location  entry field
-		includePathField = new Text(composite, SWT.BORDER);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.widthHint = SIZING_TEXT_FIELD_WIDTH;
-		data.horizontalSpan = 2;
-		includePathField.setLayoutData(data);
-		includePathField.setText(defaultOpenMPIncludePath);
-		includePathField.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				setCurrentOpenMPIncludePath(includePathField.getText());
-				if(traceOn)System.out.println("locationField.modifyText(): " + currentOpenMPIncludePath); //$NON-NLS-1$
-			}
-		});
-
-		// browse button
-		browseButton = new Button(composite, SWT.PUSH);
-		browseButton.setText(Messages.OpenMPProjectWizardPage_browse);
-		browseButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				if(traceOn)System.out.println("Browse button pressed."); //$NON-NLS-1$
-				handleLocationBrowseButtonPressed();
-
-			}
-		});
-
-		// how do we know when next/finish button pushed? we don't.
-		// we just store all info where we can find it when the OpenMPProjectProcess(ProcessRunner) runs after all the wizard pages are done.
-		
-		libLabel=new Label(composite, SWT.NONE);
-		libLabel.setText(Messages.OpenMPProjectWizardPage_library_name);
-		libLabel.setToolTipText(Messages.OpenMPProjectWizardPage_library_name_tooltip);
-		
-		libNameField=new Text(composite,SWT.BORDER);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.widthHint=SIZING_TEXT_FIELD_WIDTH;
-		gd.horizontalSpan=2;
-		libNameField.setLayoutData(gd);
-		libNameField.setText(defaultOpenMPLibName);
-		libNameField.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				setCurrentOpenMPLibName(libNameField.getText());
-				if(traceOn)System.out.println("libNameField.modifyText(): " + currentLibName); //$NON-NLS-1$
-			}
-		});
-		
-		(new Label(composite,SWT.NONE)).setText(" ");//spacer //$NON-NLS-1$
-		
-		libPathLabel=new Label(composite, SWT.NONE);
-		libPathLabel.setText(Messages.OpenMPProjectWizardPage_lib_search_path);
-		libPathLabel.setToolTipText(Messages.OpenMPProjectWizardPage_lib_search_path_tooltip);
-		
-		
-		libPathField=new Text(composite,SWT.BORDER);
-		GridData gd2 = new GridData(GridData.FILL_HORIZONTAL);
-		gd2.widthHint=SIZING_TEXT_FIELD_WIDTH;
-		gd2.horizontalSpan=2;
-		libPathField.setLayoutData(gd2);
-		libPathField.setText(defaultOpenMPLibPath);
-		libPathField.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				setCurrentOpenMPLibPath(libPathField.getText());
-				if(traceOn)System.out.println("libPathField.modifyText(): " + currentLibPath); //$NON-NLS-1$
-			}
-		});
-		
-//		 browse button
-
-		browseButton2 = new Button(composite, SWT.PUSH);
-		browseButton2.setText(Messages.OpenMPProjectWizardPage_browse);
-		browseButton2.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				if(traceOn)System.out.println("Browse button pressed. DO SOMETHING HERE."); //$NON-NLS-1$
-				handleLocationBrowseButton2Pressed();
-
-			}
-		});
-		openMPCompileCommandLabel= new Label(composite,SWT.NONE);
-		openMPCompileCommandLabel.setText(Messages.OpenMPProjectWizardPage_omp_compile_command);
-		openMPCompileCommandField=new Text(composite,SWT.BORDER);
-		GridData gd3 = new GridData(GridData.FILL_HORIZONTAL);
-		gd3.widthHint=SIZING_TEXT_FIELD_WIDTH;
-		gd3.horizontalSpan=2;
-		openMPCompileCommandField.setLayoutData(gd3);
-		openMPCompileCommandField.setText(defaultOpenMPBuildCommand);
-		openMPCompileCommandField.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				setCurrentOpenMPCompileCommand(openMPCompileCommandField.getText());
-				if(traceOn)System.out.println("OpenMPCompileCommandField.modifyText(): " + currentOpenMPCompileCommand); //$NON-NLS-1$
-			}
-		});
-		(new Label(composite,SWT.NONE)).setText(" ");//spacer //$NON-NLS-1$
-		
-		openMPLinkCommandLabel= new Label(composite,SWT.NONE);
-		openMPLinkCommandLabel.setText(Messages.OpenMPProjectWizardPage_omp_link_command);
-		openMPLinkCommandField=new Text(composite,SWT.BORDER);
-		GridData gd4 = new GridData(GridData.FILL_HORIZONTAL);
-		gd4.widthHint=SIZING_TEXT_FIELD_WIDTH;
-		gd4.horizontalSpan=2;
-		openMPLinkCommandField.setLayoutData(gd3);
-		openMPLinkCommandField.setText(defaultOpenMPBuildCommand);
-		openMPLinkCommandField.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				setCurrentOpenMPLinkCommand(openMPLinkCommandField.getText());
-				if(traceOn)System.out.println("OpenMPLinkCommandField.modifyText(): " + currentOpenMPLinkCommand); //$NON-NLS-1$
-			}
-		});
-		(new Label(composite,SWT.NONE)).setText(" ");//spacer //$NON-NLS-1$
-
-		
-	}
-
-
-	/**
-	 * Create the contents of the wizard page.
-	 * 
-	 * @param composite parent composite in which these widgets will reside
-	 * 
-	 * @param defaultEnabled do we use default mpi include path?
-	 */
-	private void createContents(Composite composite, boolean defaultEnabled) {
-
-		int columns = 4;
-
-		Composite group = new Composite(composite, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = columns;
-		group.setLayout(layout);
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		useOpenMPProjectSettingsButton = new Button(group, SWT.CHECK | SWT.RIGHT);
-		useOpenMPProjectSettingsButton.setText(Messages.OpenMPProjectWizardPage_add_project_settings_to_this_project);
-		GridData gd=new GridData();
-		gd.horizontalSpan=columns;
-		useOpenMPProjectSettingsButton.setLayoutData(gd);
-		useOpenMPProjectSettingsButton.setSelection(useOpenMPProjectSettings);
-		useOpenMPProjectSettingsButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				useOpenMPProjectSettings = useOpenMPProjectSettingsButton.getSelection();
-				// set value so we can read it later
-				pageData.put(PAGE_ID+DOT+DO_OpenMP_INCLUDES, Boolean.toString(useOpenMPProjectSettings));
-				
-				useDefaultsButton.setEnabled(useOpenMPProjectSettings);
-				if(OpenMPSampleButton!=null)
-				   OpenMPSampleButton.setEnabled(useOpenMPProjectSettings);
-				if(useOpenMPProjectSettings) {
-				  boolean useDefaults=useDefaultsButton.getSelection();
-				  setUserAreaEnabled(!useDefaults);
-				}
-				
-				else
-					setUserAreaEnabled(false);
-				
-			}
-		});
-
-		useDefaultsButton = new Button(group, SWT.CHECK | SWT.RIGHT);
-		useDefaultsButton.setText(Messages.OpenMPProjectWizardPage_use_default_info_q);
-		useDefaultsButton.setSelection(defaultEnabled);
-		useDefaultsButton.setEnabled(false);
-		GridData buttonData = new GridData();
-		buttonData.horizontalSpan = columns;
-		useDefaultsButton.setLayoutData(buttonData);
-		useDefaultsButton.addSelectionListener(new SelectionAdapter() {
-
-			public void widgetSelected(SelectionEvent e) {
-				boolean useDefaults = useDefaultsButton.getSelection();
-
-				if (useDefaults) { 
-					// reset all fields and values back to the defaults
-					includePathField.setText(defaultOpenMPIncludePath);
-					setCurrentOpenMPIncludePath(defaultOpenMPIncludePath);
-					
-					libPathField.setText(defaultOpenMPLibName);
-					setCurrentOpenMPLibName(defaultOpenMPLibName);
-					
-					libNameField.setText(defaultOpenMPLibName);
-					setCurrentOpenMPLibName(defaultOpenMPLibName);
-					
-					libPathField.setText(defaultOpenMPLibPath);
-					setCurrentOpenMPLibPath(defaultOpenMPLibPath);
-					
-					openMPCompileCommandField.setText(defaultOpenMPBuildCommand);
-					setCurrentOpenMPCompileCommand(defaultOpenMPBuildCommand);
-					
-					openMPLinkCommandField.setText(defaultOpenMPBuildCommand);
-					setCurrentOpenMPLinkCommand(defaultOpenMPBuildCommand);
-				}
-				setUserAreaEnabled(!useDefaults);
-			}
-		});
-
-		createUserEntryArea(group, defaultEnabled);
-/*		
- 		// mpi sample file now provided by project template (also openmp)
-		OpenMPSampleButton = new Button(group, SWT.CHECK | SWT.RIGHT);
-		OpenMPSampleButton.setText("Include sample OpenMP source file?");
-		OpenMPSampleButton.setSelection(false);
-		OpenMPSampleButton.setEnabled(false);
-		GridData gdSample=new GridData();
-		gdSample.horizontalSpan = columns;
-		OpenMPSampleButton.setLayoutData(gdSample);
-		OpenMPSampleButton.addSelectionListener(new SelectionAdapter() {
-		
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				boolean doit=OpenMPSampleButton.getSelection();
-				setCurrentOpenMPSample(doit);
-			}
-		
-		});
-		*/
-		setUserAreaEnabled(!defaultEnabled);
-
-	}
-
-	public void createControl(Composite parent) {
-
-		composite = new Composite(parent, SWT.NULL);
-		composite.setLayout(new GridLayout());
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		boolean defaultEnabled = true;
-		createContents(composite, defaultEnabled);
-	}
-
-	public void dispose() {
-		composite.dispose();
-
-	}
-
-	public Control getControl() {
-		return composite;
-	}
-
-	public String getDescription() {
-		String tmp=Messages.OpenMPProjectWizardPage_select_stuff_to_be_added_to_proj;
-		return tmp;
-	}
-
-	public String getErrorMessage() {
-		return null;
-		// return new String("My error msg");
-	}
-
-	public Image getImage() {
-		return getWizard().getDefaultPageImage();
-	}
-
-	public String getMessage() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public String getTitle() {
-		return Messages.OpenMPProjectWizardPage_omp_project_settings_title;
-	}
-
-	public void performHelp() {
-		// do nothing
-
-	}
-
-	public void setDescription(String description) {
-		// do nothing
-
-	}
-
-	public void setImageDescriptor(ImageDescriptor image) {
-		// do nothing
-
-	}
-
-	public void setTitle(String title) {
-		// do nothing
-
-	}
-
-	/**
-	 * If you need to init data/widgets on the page when it is displayed based
-	 * on the data set in previous pages, you can override
-	 * IDialogPage.setVisible(boolean visible) and setup everything when visible ==
-	 * true.
-	 * 
-	 * Otherwise, do inits in the ctor.
-	 */
-	public void setVisible(boolean visible) {
-		composite.setVisible(visible);
-		if(traceOn)System.out.println("OpenMPProjectWizardPage.setVisible: " + visible); //$NON-NLS-1$
-
-	}
-
-	/**
-	 * Determines the status of the wizard's finish button. If we don't want the
-	 * user to press finish yet, set this to false. <br>
-	 * The Next/Finish/Cancel methods belong to the wizard itself and not the
-	 * pages.
-	 * 
-	 * @return boolean true if finish button should be enabled; false otherwise.
-	 */
-	protected boolean isCustomPageComplete() {
-		// BRT if isDefaults is not checked then includePathField etc. should be
-		// filled in.
-		// BRT if isDefaults is checked then there should actually BE some
-		// defaults to use.
-		return true;
-	}
-
-	/**
-	 * Enable/disable "user area" which is the place user can type and make
-	 * changes (includePathField, its label and button, etc.)
-	 * 
-	 * @param enabled
-	 */
-	private void setUserAreaEnabled(boolean enabled) {
-		
-		includePathField.setEnabled(enabled);
-		browseButton.setEnabled(enabled);
-		browseButton2.setEnabled(enabled);
-		libNameField.setEnabled(enabled);
-		libPathField.setEnabled(enabled);
-		
-		includePathLabel.setEnabled(enabled);
-		libPathLabel.setEnabled(enabled);
-		libLabel.setEnabled(enabled);
-		
-		openMPCompileCommandLabel.setEnabled(enabled);
-		openMPCompileCommandField.setEnabled(enabled);
-		openMPLinkCommandLabel.setEnabled(enabled);
-		openMPLinkCommandField.setEnabled(enabled);
-	}
-	
-	/**
-	 * What's the default, do we include OpenMP includes or not?
-	 * If there is any difficulty getting information, use this default
-	 * setting.
-	 * @return
-	 */
-	public static boolean getDefaultUseOpenMPIncludes() {
-		return defaultUseOpenMPIncludes;
-	}
-
-	public Map<String,String> getPageData() {
-		return pageData;
-	}
-	@Override
-	protected IPreferencePage getPreferencePage() {
-		if(preferencePage == null) {
-			preferencePage = new org.eclipse.ptp.pldt.openmp.core.prefs.OpenMPPreferencePage();
-		}
-		return preferencePage;
-	}
-
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIemptyCproject/template.xml b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIemptyCproject/template.xml
deleted file mode 100644
index a11d7af..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIemptyCproject/template.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<template type="ProjTempl" version="1.0" supplier="Eclipse.org" revision="1.0" author="IBM Research"
-		copyright="Copyright (c) 2007 IBM Corp. 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"
-		id="MPIemptyCproject" label="MPI Empty C Project" description="An empty MPI  project template"
-		 help="help.html">
-
-	<process type="org.eclipse.ptp.pldt.wizards.mpiProjectProcess">
-		<!-- no arguments as we go straight to the store (not recommended usage of template engine..) -->
-	</process>
-</template>
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIhelloWorldCproject/src/Basename.c b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIhelloWorldCproject/src/Basename.c
deleted file mode 100644
index 0f6c962..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIhelloWorldCproject/src/Basename.c
+++ /dev/null

@@ -1,55 +0,0 @@
-/*
- ============================================================================
- Name        : $(baseName).c
- Author      : $(author)
- Version     :
- Copyright   : $(copyright)
- Description : Hello MPI World in C 
- ============================================================================
- */
-#include <stdio.h>
-#include <string.h>
-#include "mpi.h"
-
-int main(int argc, char* argv[]){
-	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, "$(mpi.hello.message) 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("$(mpi.hello.message) 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.wizards/templates/MPIhelloWorldCproject/template.properties b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIhelloWorldCproject/template.properties
deleted file mode 100644
index 2566832..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIhelloWorldCproject/template.properties
+++ /dev/null

@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Research
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Beth Tibbitts (IBM Research)  
-###############################################################################
-
-#Template Default Values
-HelloWorld.CAnsitemplate.label=MPI Hello World C Project
-HelloWorld.CAnsitemplate.description=A skeletal Managed C Hello World project. Creates a folder for sources and another for include.
-HelloWorld.basics.label=Basic Settings
-HelloWorld.basics.description=Basic properties of a project
-HelloWorld.author.label=Author
-HelloWorld.author.description=Name of the author
-HelloWorld.copyright.label=Copyright notice
-HelloWorld.copyright.description=Your copyright notice
-HelloWorld.copyright.default=Your copyright notice
-HelloWorld.message.default.mpi=Hello MPI World
-HelloWorld.message.description=Your hello world greeting message
-HelloWorld.message.label=Hello world greeting
-HelloWorld.sourceDir.label=Source
-HelloWorld.sourceDir.description=Directory for hello world project source files
-HelloWorld.sourceDir.default=src

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIhelloWorldCproject/template.xml b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIhelloWorldCproject/template.xml
deleted file mode 100644
index 9274e6a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIhelloWorldCproject/template.xml
+++ /dev/null

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<template type="ProjTempl" version="1.0" supplier="Eclipse.org" revision="1.0" author="Beth Tibbitts (IBM Research)"
-		copyright="blah blah "
-		id="MPIhelloWorldCProject" label="%HelloWorld.CAnsitemplate.label" description="%HelloWorld.CAnsitemplate.description"
-		 help="help.html">
-	<property-group id="basics" label="%HelloWorld.basics.label" description="%HelloWorld.basics.description" type="PAGES-ONLY" help="help.html">
-		<property id="author"
-			label="%HelloWorld.author.label"
-			description="%HelloWorld.author.description"
-			type="input"
-			pattern=".*"
-			default=""
-			hidden="false"
-			persist="true"/>
-		<property id="copyright"
-			label="%HelloWorld.copyright.label"
-			description="%HelloWorld.copyright.description"
-			type="input"
-			pattern=".*"
-			default="%HelloWorld.copyright.default"
-			hidden="false"
-			persist="true"/>
-		<property id="mpi.hello.message"
-			label="%HelloWorld.message.label"
-			description="%HelloWorld.message.description"
-			type="input"
-			pattern=".*"
-			default="%HelloWorld.message.default.mpi"
-			hidden="false"
-			persist="true"/>
-		<property id="sourceDir"
-				label="%HelloWorld.sourceDir.label"
-				description="%HelloWorld.sourceDir.description"
-				type="input"
-				default="%HelloWorld.sourceDir.default"
-				pattern="[a-zA-Z0-9]+"
-				mandatory="false"
-				persist="true"/>
-	</property-group>
-
-	<process type="org.eclipse.cdt.managedbuilder.core.NewManagedProject">
-		<simple name="name" value="$(projectName)" /> 
-		<simple name="artifactExtension" value="exe" /> 
-		<simple name="isCProject" value="true" /> 
-	</process>
-
-	<process type="org.eclipse.cdt.core.CreateSourceFolder">
-		<simple name="projectName" value="$(projectName)"/>
-		<simple name="path" value="$(sourceDir)"/>
-	</process>
-
-	<process type="org.eclipse.cdt.core.AddFiles">
-		<simple name="projectName" value="$(projectName)"/>
-		<complex-array name="files">
-			<element>
-				<simple name="source" value="src/Basename.c"/>
-				<simple name="target" value="$(sourceDir)/$(projectName).c"/>
-				<simple name="replaceable" value="true"/>
-			</element>
-		</complex-array>
-	</process>
-	
-	<process type="org.eclipse.ptp.pldt.wizards.mpiProjectProcess">
-		<!-- no arguments as we go straight to the store (not recommended usage of template engine..) -->
-	</process>
-
-</template>
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCPPproject/src/Basename.cpp b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCPPproject/src/Basename.cpp
deleted file mode 100644
index 983a0cb..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCPPproject/src/Basename.cpp
+++ /dev/null

@@ -1,57 +0,0 @@
-/*
- ============================================================================
- Name        : $(baseName).c
- Author      : $(author)
- Version     :
- Copyright   : $(copyright)
- 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(); 
- 
-    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.wizards/templates/MPIpiCPPproject/template.properties b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCPPproject/template.properties
deleted file mode 100644
index 6cff9a2..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCPPproject/template.properties
+++ /dev/null

@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Research
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Beth Tibbitts (IBM Research)  
-###############################################################################
-
-#Template Default Values
-MPIcppPi.CAnsitemplate.label=MPI Pi C++ Project
-MPIcppPi.CAnsitemplate.description=A skeletal Managed CPP  project. Creates a folder for sources and another for include.
-MPIcppPi.basics.label=Basic Settings
-MPIcppPi.basics.description=Basic properties of a project
-MPIcppPi.author.label=Author
-MPIcppPi.author.description=Name of the author
-MPIcppPi.copyright.label=Copyright notice
-MPIcppPi.copyright.description=Your copyright notice
-MPIcppPi.copyright.default=Your copyright notice
-MPIcppPi.message.default.mpi=Hello MPI C++ Pi World
-MPIcppPi.message.description=Your  greeting message
-MPIcppPi.message.label=Hello world greeting
-MPIcppPi.sourceDir.label=Source
-MPIcppPi.sourceDir.description=Directory for  project source files
-MPIcppPi.sourceDir.default=src

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCPPproject/template.xml b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCPPproject/template.xml
deleted file mode 100644
index 7c79651..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCPPproject/template.xml
+++ /dev/null

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<template type="ProjTempl" version="1.0" supplier="Eclipse.org" revision="1.0" author="Beth Tibbitts (IBM Research)"
-		copyright="blah blah "
-		id="MPIcppPiProject" label="%MPIcppPi.CAnsitemplate.label" description="%MPIcppPi.CAnsitemplate.description"
-		 help="help.html">
-	<property-group id="basics" label="%MPIcppPi.basics.label" description="%MPIcppPi.basics.description" type="PAGES-ONLY" help="help.html">
-		<property id="author"
-			label="%MPIcppPi.author.label"
-			description="%MPIcppPi.author.description"
-			type="input"
-			pattern=".*"
-			default=""
-			hidden="false"
-			persist="true"/>
-		<property id="copyright"
-			label="%MPIcppPi.copyright.label"
-			description="%MPIcppPi.copyright.description"
-			type="input"
-			pattern=".*"
-			default="%MPIcppPi.copyright.default"
-			hidden="false"
-			persist="true"/>
-		<property id="mpi.hello.message"
-			label="%MPIcppPi.message.label"
-			description="%MPIcppPi.message.description"
-			type="input"
-			pattern=".*"
-			default="%MPIcppPi.message.default.mpi"
-			hidden="false"
-			persist="true"/>
-		<property id="sourceDir"
-				label="%MPIcppPi.sourceDir.label"
-				description="%MPIcppPi.sourceDir.description"
-				type="input"
-				default="%MPIcppPi.sourceDir.default"
-				pattern="[a-zA-Z0-9]+"
-				mandatory="false"
-				persist="true"/>
-	</property-group>
-
-	<process type="org.eclipse.cdt.managedbuilder.core.NewManagedProject">
-		<simple name="name" value="$(projectName)" /> 
-		<simple name="artifactExtension" value="exe" /> 
-		<simple name="isCProject" value="true" /> 
-	</process>
-
-	<process type="org.eclipse.cdt.core.CreateSourceFolder">
-		<simple name="projectName" value="$(projectName)"/>
-		<simple name="path" value="$(sourceDir)"/>
-	</process>
-
-	<process type="org.eclipse.cdt.core.AddFiles">
-		<simple name="projectName" value="$(projectName)"/>
-		<complex-array name="files">
-			<element>
-				<simple name="source" value="src/Basename.cpp"/>
-				<simple name="target" value="$(sourceDir)/$(projectName).cpp"/>
-				<simple name="replaceable" value="true"/>
-			</element>
-		</complex-array>
-	</process>
-	
-	<process type="org.eclipse.ptp.pldt.wizards.mpiProjectProcessCPP">
-		<!-- no arguments as we go straight to the store (not recommended usage of template engine..) -->
-	</process>
-
-</template>
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCproject/src/Basename.c b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCproject/src/Basename.c
deleted file mode 100644
index 9646bb5..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCproject/src/Basename.c
+++ /dev/null

@@ -1,106 +0,0 @@
-/*
- ============================================================================
- Name        : $(baseName).c
- Author      : $(author)
- Version     :
- Copyright   : $(copyright)
- Description : Calculate Pi in MPI
- ============================================================================
- */
-#include <mpi.h>
-#include <stdio.h>
-#include <string.h>
-
-void
-calc_pi(int rank, int num_procs)
-{
-	int		i;
-	int		num_intervals;
-	double	h;
-	double	mypi;
-	double	pi;
-	double	sum;
-	double	x;
-
-	/* set number of intervals to calculate */
-	if (rank == 0) {
-		num_intervals = 100000000;
-	}
-
-	/* tell other tasks how many intervals */
-	MPI_Bcast(&num_intervals, 1, MPI_INT, 0, MPI_COMM_WORLD);
-
-	/* now everyone does their calculation */
-
-	h = 1.0 / (double) num_intervals; 
-	sum = 0.0;
-
-	for (i = rank + 1; i <= num_intervals; i += num_procs) { 
-		x = h * ((double)i - 0.5); 
-		sum += (4.0 / (1.0 + x*x)); 
-	} 
-
-	mypi = h * sum;
-
-	/* combine everyone's calculations */
-	MPI_Reduce(&mypi, &pi, 1, MPI_DOUBLE, MPI_SUM, 0, MPI_COMM_WORLD);
-
-	if (rank == 0) {
-		printf("PI is approximately %.16f\n", pi);
-	}
-}
-
-int 
-main(int argc, char *argv[])
-{
-	int			my_rank;		/* rank of process */
-	int			num_procs;		/* number of processes */
-	int			source;			/* rank of sender */
-	int			dest = 0;		/* 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, &num_procs); 
-
-
-	if (my_rank != 0) {
-		/* create message */
-		sprintf(message, "Greetings from process %d!", my_rank);
-		/* use strlen+1 so that '\0' get transmitted */
-		MPI_Send(message, strlen(message)+1, MPI_CHAR,
-				dest, tag, MPI_COMM_WORLD);
-	} else {
-		printf("Num processes: %d\n",num_procs);
-		for (source = 1; source < num_procs; source++) {
-			MPI_Recv(message, 100, MPI_CHAR, source, tag,
-					MPI_COMM_WORLD, &status);
-			printf("Process 0 received \"%s\"\n",message);
-		}
-
-		/* now return the compliment */
-		sprintf(message, "Hi, how are you?");
-	}
-
-	MPI_Bcast(message, strlen(message)+1, MPI_CHAR, dest, MPI_COMM_WORLD);
-
-	if (my_rank != 0) {
-		printf("Process %d received \"%s\"\n", my_rank, message);
-	}
-
-	/* calculate PI */
-	calc_pi(my_rank, num_procs);
-
-	/* shut down MPI */
-	MPI_Finalize(); 
-
-	return 0;
-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCproject/template.properties b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCproject/template.properties
deleted file mode 100644
index 3719c84..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCproject/template.properties
+++ /dev/null

@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Research
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Beth Tibbitts (IBM Research)  
-###############################################################################
-
-#Template Default Values
-MPIpi.template.label=MPI Pi C Project
-MPIpi.CAnsitemplate.description=MPI project to calculate Pi. Employs a variety of MPI APIs.
-MPIpi.basics.label=Basic Settings
-MPIpi.basics.description=Basic properties of a project
-MPIpi.author.label=Author
-MPIpi.author.description=Name of the author
-MPIpi.copyright.label=Copyright notice
-MPIpi.copyright.description=Your copyright notice
-MPIpi.copyright.default=Your copyright notice
-MPIpi.message.default.mpipi=Hello MPI Pi World
-MPIpi.message.description=Your greeting message
-MPIpi.message.label=Greeting
-MPIpi.sourceDir.label=Source
-MPIpi.sourceDir.description=Directory for  project source files
-MPIpi.sourceDir.default=src

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCproject/template.xml b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCproject/template.xml
deleted file mode 100644
index b008077..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/MPIpiCproject/template.xml
+++ /dev/null

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<template type="ProjTempl" version="1.0" supplier="Eclipse.org" revision="1.0" author="Beth Tibbitts (IBM Research)"
-		copyright="blah blah "
-		id="MPIpiCProject" label="%MPIpi.template.label" description="%MPIpi.template.description"
-		 help="help.html">
-	<property-group id="basics" label="%MPIpi.basics.label" description="%MPIpi.basics.description" type="PAGES-ONLY" help="help.html">
-		<property id="author"
-			label="%MPIpi.author.label"
-			description="%MPIpi.author.description"
-			type="input"
-			pattern=".*"
-			default=""
-			hidden="false"
-			persist="true"/>
-		<property id="copyright"
-			label="%MPIpi.copyright.label"
-			description="%MPIpi.copyright.description"
-			type="input"
-			pattern=".*"
-			default="%MPIpi.copyright.default"
-			hidden="false"
-			persist="true"/>
-		<property id="mpi.hello.message"
-			label="%MPIpi.message.label"
-			description="%MPIpi.message.description"
-			type="input"
-			pattern=".*"
-			default="%MPIpi.message.default.mpipi"
-			hidden="false"
-			persist="true"/>
-		<property id="sourceDir"
-				label="%MPIpi.sourceDir.label"
-				description="%MPIpi.sourceDir.description"
-				type="input"
-				default="%MPIpi.sourceDir.default"
-				pattern="[a-zA-Z0-9]+"
-				mandatory="false"
-				persist="true"/>
-	</property-group>
-
-	<process type="org.eclipse.cdt.managedbuilder.core.NewManagedProject">
-		<simple name="name" value="$(projectName)" /> 
-		<simple name="artifactExtension" value="exe" /> 
-		<simple name="isCProject" value="true" /> 
-	</process>
-
-	<process type="org.eclipse.cdt.core.CreateSourceFolder">
-		<simple name="projectName" value="$(projectName)"/>
-		<simple name="path" value="$(sourceDir)"/>
-	</process>
-
-	<process type="org.eclipse.cdt.core.AddFiles">
-		<simple name="projectName" value="$(projectName)"/>
-		<complex-array name="files">
-			<element>
-				<simple name="source" value="src/Basename.c"/>
-				<simple name="target" value="$(sourceDir)/$(projectName).c"/>
-				<simple name="replaceable" value="true"/>
-			</element>
-		</complex-array>
-	</process>
-	
-	<process type="org.eclipse.ptp.pldt.wizards.mpiProjectProcess">
-		<!-- no arguments as we go straight to the store (not recommended usage of template engine..) -->
-	</process>
-
-</template>
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPemptyCproject/template.xml b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPemptyCproject/template.xml
deleted file mode 100644
index 3dd41bf..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPemptyCproject/template.xml
+++ /dev/null

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<template type="ProjTempl" version="1.0" supplier="Eclipse.org" revision="1.0" author="IBM Research"
-		copyright="Copyright (c) 2007 IBM Corp. 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"
-		id="OpenMPemptyCProject" label="OpenMP Empty C Project" description="An OpenMP MPI project template"
-		 help="help.html">
-
-	<process type="org.eclipse.ptp.pldt.wizards.openMPProjectProcess">
-		<!-- no arguments as we go straight to the store (not recommended usage of template engine..) -->
-	</process>
-</template>
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/src/Basename.c b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/src/Basename.c
deleted file mode 100644
index df556e8..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/src/Basename.c
+++ /dev/null

@@ -1,36 +0,0 @@
-/*
- ============================================================================
- Name        : $(baseName).c
- Author      : $(author)
- Version     :
- Copyright   : $(copyright)
- 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);
-     }
- }
- return 0;
-}
-
-

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/src/testOpenMP.c b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/src/testOpenMP.c
deleted file mode 100644
index 2aeafeb..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/src/testOpenMP.c
+++ /dev/null

@@ -1,25 +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.wizards/templates/OpenMPhelloWorldCproject/template.properties b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/template.properties
deleted file mode 100644
index 62b68a7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/template.properties
+++ /dev/null

@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Research
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     Beth Tibbitts (IBM Research)  
-###############################################################################
-
-#Template Default Values
-HelloWorld.CAnsitemplate.label=OpenMP Hello World C Project
-HelloWorld.CAnsitemplate.description=A skeletal Managed C Hello World project. Creates a folder for sources and another for include.
-HelloWorld.basics.label=Basic Settings
-HelloWorld.basics.description=Basic properties of a project
-HelloWorld.author.label=Author
-HelloWorld.author.description=Name of the author
-HelloWorld.copyright.label=Copyright notice
-HelloWorld.copyright.description=Your copyright notice
-HelloWorld.copyright.default=Your copyright notice
-HelloWorld.message.default.omp=Hello OpenMP World
-HelloWorld.message.description=Your hello world greeting message
-HelloWorld.message.label=Hello world greeting
-HelloWorld.sourceDir.label=Source
-HelloWorld.sourceDir.description=Directory for hello world project source files
-HelloWorld.sourceDir.default=src

diff --git a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/template.xml b/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/template.xml
deleted file mode 100644
index 1ca0aac..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.wizards/templates/OpenMPhelloWorldCproject/template.xml
+++ /dev/null

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<template type="ProjTempl" version="1.0" supplier="Eclipse.org" revision="1.0" author="Beth Tibbitts (IBM Research)"
-		copyright="blah blah "
-		id="OpenMPhelloWorldCproject" label="%HelloWorld.CAnsitemplate.label" description="%HelloWorld.CAnsitemplate.description"
-		 help="help.html">
-
-	<property-group id="basics" label="%HelloWorld.basics.label" description="%HelloWorld.basics.description" type="PAGES-ONLY" help="help.html">
-		<property id="author"
-			label="%HelloWorld.author.label"
-			description="%HelloWorld.author.description"
-			type="input"
-			pattern=".*"
-			default=""
-			hidden="false"
-			persist="true"/>
-		<property id="copyright"
-			label="%HelloWorld.copyright.label"
-			description="%HelloWorld.copyright.description"
-			type="input"
-			pattern=".*"
-			default="%HelloWorld.copyright.default"
-			hidden="false"
-			persist="true"/>
-		<property id="openmp.hello.message"
-			label="%HelloWorld.message.label"
-			description="%HelloWorld.message.description"
-			type="input"
-			pattern=".*"
-			default="%HelloWorld.message.default.omp"
-			hidden="false"
-			persist="true"/>
-		<property id="sourceDir"
-				label="%HelloWorld.sourceDir.label"
-				description="%HelloWorld.sourceDir.description"
-				type="input"
-				default="%HelloWorld.sourceDir.default"
-				pattern="[a-zA-Z0-9]+"
-				mandatory="false"
-				persist="true"/>
-	</property-group>
-
-	<process type="org.eclipse.cdt.managedbuilder.core.NewManagedProject">
-		<simple name="name" value="$(projectName)" /> 
-		<simple name="artifactExtension" value="exe" /> 
-		<simple name="isCProject" value="true" /> 
-	</process>
-
-	<process type="org.eclipse.cdt.core.CreateSourceFolder">
-		<simple name="projectName" value="$(projectName)"/>
-		<simple name="path" value="$(sourceDir)"/>
-	</process>
-
-	<process type="org.eclipse.cdt.core.AddFiles">
-		<simple name="projectName" value="$(projectName)"/>
-		<complex-array name="files">
-			<element>
-				<simple name="source" value="src/Basename.c"/>
-				<simple name="target" value="$(sourceDir)/$(projectName).c"/>
-				<simple name="replaceable" value="true"/>
-			</element>
-		</complex-array>
-	</process>
-
-	<process type="org.eclipse.ptp.pldt.wizards.openMPProjectProcess">
-		<!-- no arguments as we go straight to the store (not recommended usage of template engine..) -->
-	</process>
-</template>
-

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/.classpath b/tools/remotetools/org.eclipse.ptp.remotetools.core/.classpath
deleted file mode 100755
index 64c5e31..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.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/tools/remotetools/org.eclipse.ptp.remotetools.core/.project b/tools/remotetools/org.eclipse.ptp.remotetools.core/.project
deleted file mode 100755
index 535db4a..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.remotetools.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/tools/remotetools/org.eclipse.ptp.remotetools.core/.settings/org.eclipse.jdt.core.prefs b/tools/remotetools/org.eclipse.ptp.remotetools.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8c39436..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,8 +0,0 @@
-#Thu Mar 04 10:35:52 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.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/remotetools/org.eclipse.ptp.remotetools.core/META-INF/MANIFEST.MF b/tools/remotetools/org.eclipse.ptp.remotetools.core/META-INF/MANIFEST.MF
deleted file mode 100755
index 08869d2..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.remotetools.core;singleton:=true
-Bundle-Version: 3.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.remotetools.RemotetoolsPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- com.jcraft.jsch,
- org.eclipse.jsch.core,
- org.eclipse.ptp.remotetools.utils,
- org.eclipse.ptp.utils.core;bundle-version="1.0.0"
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.ptp.remotetools,
- org.eclipse.ptp.remotetools.core,
- org.eclipse.ptp.remotetools.exception
-Bundle-ClassPath: 
- .
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: com.ibm.icu.text

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/about.html b/tools/remotetools/org.eclipse.ptp.remotetools.core/about.html
deleted file mode 100755
index a78242d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/about.ini b/tools/remotetools/org.eclipse.ptp.remotetools.core/about.ini
deleted file mode 100644
index b26762a..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/about.ini
+++ /dev/null

@@ -1,27 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/about.mappings b/tools/remotetools/org.eclipse.ptp.remotetools.core/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.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/tools/remotetools/org.eclipse.ptp.remotetools.core/about.properties b/tools/remotetools/org.eclipse.ptp.remotetools.core/about.properties
deleted file mode 100644
index 0674b9d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/about.properties
+++ /dev/null

@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-blurb=PTP Remote Tools\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-Copyright (c) 2008 IBM Corporation, and others.  All rights reserved.\n\
-Visit http://www.eclipse.org/ptp\n
-

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/build.properties b/tools/remotetools/org.eclipse.ptp.remotetools.core/build.properties
deleted file mode 100755
index a179b11..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/build.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               eclipse32.png,\
-               plugin.properties

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/eclipse32.png b/tools/remotetools/org.eclipse.ptp.remotetools.core/eclipse32.png
deleted file mode 100644
index 568fac1..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/eclipse32.png
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/plugin.properties b/tools/remotetools/org.eclipse.ptp.remotetools.core/plugin.properties
deleted file mode 100644
index a3310e0..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.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 Remote Tools
-pluginProvider=Eclipse.org

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/plugin.xml b/tools/remotetools/org.eclipse.ptp.remotetools.core/plugin.xml
deleted file mode 100755
index 8e49b52..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/plugin.xml
+++ /dev/null

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-</plugin>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/RemotetoolsPlugin.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/RemotetoolsPlugin.java
deleted file mode 100755
index 0fe6d9d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/RemotetoolsPlugin.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jsch.core.IJSchService;
-import org.eclipse.ptp.remotetools.core.IRemoteConnection;
-import org.eclipse.ptp.remotetools.internal.ssh.CipherTypes;
-import org.eclipse.ptp.remotetools.internal.ssh.Connection;
-import org.osgi.framework.BundleContext;
-import org.osgi.util.tracker.ServiceTracker;
-
-/**
- * The main plug-in class to be used in the desktop.
- */
-public class RemotetoolsPlugin extends Plugin {
-
-	// The shared instance.
-	private static RemotetoolsPlugin plugin;
-	// ServiceTracker for IJschService
-	private ServiceTracker tracker;
-
-	/**
-	 * The constructor.
-	 */
-	public RemotetoolsPlugin() {
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		tracker = new ServiceTracker(getBundle().getBundleContext(), IJSchService.class.getName(), null);
-		tracker.open();
-	}
-
-	/**
-	 * 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 RemotetoolsPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an instance of IJSchService from the OSGi Registry.
-	 * 
-	 * @return An instance of IJSchService, or <code>null</code> if no
-	 *         IJschService service is available.
-	 */
-	public IJSchService getJSchService() {
-		return (IJSchService) tracker.getService();
-	}
-
-	/**
-	 * Returns an instance of {@link IRemoteConnection} using a ssh connection.
-	 * 
-	 * @since 3.0
-	 */
-	public static IRemoteConnection createSSHConnection() {
-		return new Connection();
-	}
-
-	/**
-	 * 3DES cipher type
-	 */
-	public static final String CIPHER_3DES = org.eclipse.ptp.remotetools.internal.ssh.CipherTypes.CIPHER_3DES;
-	/**
-	 * AES128 cipher type
-	 */
-	public static final String CIPHER_AES128 = org.eclipse.ptp.remotetools.internal.ssh.CipherTypes.CIPHER_AES128;
-	/**
-	 * AES192 cipher type
-	 */
-	public static final String CIPHER_AES192 = org.eclipse.ptp.remotetools.internal.ssh.CipherTypes.CIPHER_AES192;
-	/**
-	 * AES256 cipher type
-	 */
-	public static final String CIPHER_AES256 = org.eclipse.ptp.remotetools.internal.ssh.CipherTypes.CIPHER_AES256;
-	/**
-	 * Blowfish cipher type
-	 */
-	public static final String CIPHER_BLOWFISH = org.eclipse.ptp.remotetools.internal.ssh.CipherTypes.CIPHER_BLOWFISH;
-	/**
-	 * Default cipher type
-	 */
-	public static final String CIPHER_DEFAULT = org.eclipse.ptp.remotetools.internal.ssh.CipherTypes.CIPHER_DEFAULT;
-
-	public static Map getCipherTypesMap() {
-		HashMap map = new HashMap(CipherTypes.getCipherTypesMap());
-
-		return map;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/AuthToken.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/AuthToken.java
deleted file mode 100755
index ab14072..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/AuthToken.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-/**
- * 
- * 
- * @author Richard Maciel
- *
- */
-public abstract class AuthToken {
-	private String username;
-
-	public AuthToken(String username) {
-		this.username = username;
-	}
-	
-	public String getUsername() {
-		return username;
-	}
-
-	public void setUsername(String username) {
-		this.username = username;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/ILocalPortForwarding.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/ILocalPortForwarding.java
deleted file mode 100644
index 899914c..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/ILocalPortForwarding.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-/**
- * Represents a local port forwarding created by
- * {@link IRemotePortForwardingTools}.
- * <p>
- * The local port is forwarded to a host:port accessibly to the remote host.
- * <p>
- * Check inherited {@link IPortForwarding} for more methods.
- */
-public interface ILocalPortForwarding extends IPortForwarding {
-	/** The local port that is being forwarded. */
-	public abstract int getLocalPort();
-
-	/** The host where the local port is forwarded to. */
-	public abstract String getRemoteAddress();
-
-	/** The port on the host where the local port is forwarded to. */
-	public abstract int getRemotePort();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IPortForwarding.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IPortForwarding.java
deleted file mode 100644
index 301e584..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IPortForwarding.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.PortForwardingException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-
-/**
- * Represents a port forwarding created by {@link IRemotePortForwardingTools}.
- * <p>
- * In order to turn off port forwarding, call {@link #release()} or
- * {@link IRemotePortForwardingTools#releaseForwarding(IPortForwarding)}.
- * <p>
- * The information that describes the port forwarding is valid until the
- * forwarding is turned off. The check if the forwarding is active, call
- * {@link #isActive()}.
- * 
- * @author Daniel Felix Ferber
- */
-public interface IPortForwarding {
-	/** If the port forwarding is turned on. */
-	public abstract boolean isActive();
-
-	/**
-	 * Turn off the port forwarding. It is facility method that calls
-	 * {@link IRemotePortForwardingTools#releaseForwarding(IPortForwarding)}.
-	 * 
-	 * @throws RemoteConnectionException
-	 *             The connection is not in a valid state anymore.
-	 * @throws PortForwardingException
-	 *             Failed to turn off the remote port forwarding. The forwarding
-	 *             was already turned off before.
-	 * @throws CancelException 
-	 */
-	public abstract void release() throws RemoteConnectionException,
-			PortForwardingException, CancelException;
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteConnection.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteConnection.java
deleted file mode 100755
index 1ccff04..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteConnection.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-
-/**
- * NOTE: this interface should not normally be used directly but called via the
- * org.eclipse.ptp.remote.core interfaces.
- * 
- * A connection to a remote host. Serves as a starting point for creating
- * {@link IRemoteExecutionManager}, that to operations on the remote host.
- * 
- * It is the responsibility of the caller to check that a remote connection is
- * open before using it. If the connection was open, but has been closed for
- * some reason, {@link #disconnect()} must be called before
- * {@link #connect(AuthToken, String, int, String, int, IProgressMonitor)} is
- * called again.
- * 
- * @author Richard Maciel, Daniel Felix Ferber
- * @since 1.1 <b>Review OK</b>
- * 
- * @see org.eclipse.ptp.remote.core.IRemoteConnection
- */
-public interface IRemoteConnection {
-	/**
-	 * Connect to the remote machine. The {@link #disconnect()} method must be
-	 * called before this method if the connection was dropped for some reason.
-	 * 
-	 * @param authToken
-	 *            authentication information for connection
-	 * @param hostname
-	 *            host to connect to
-	 * @param port
-	 *            port number of remote host or 0 for default port
-	 * @param cipherType
-	 *            cipher type or null for default cypher
-	 * @param timeout
-	 *            connection timeout or 0 for default timeout
-	 * @param monitor
-	 *            progress monitor
-	 * @throws RemoteConnectionException
-	 * @since 3.0
-	 */
-	public void connect(AuthToken authToken, String hostname, int port, String cipherType, int timeout, IProgressMonitor monitor)
-			throws RemoteConnectionException;
-
-	/**
-	 * Terminate connection to remote machine.
-	 * <p>
-	 * TODO: Decide: Block until all pending operations are finished or cancels
-	 * pending operations?
-	 */
-	public void disconnect();
-
-	/**
-	 * Check if successfully connected with the remote host.
-	 * 
-	 * @return True if is connected with remote host
-	 */
-	public boolean isConnected();
-
-	/**
-	 * Create a proper instance of {@link IRemoteExecutionManager}.
-	 * 
-	 * @return the {@link IRemoteExecutionManager} for this connection
-	 * @throws RemoteConnectionException
-	 *             if the {@link IRemoteExecutionManager} could not be created.
-	 */
-	public IRemoteExecutionManager createRemoteExecutionManager() throws RemoteConnectionException;
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteCopyTools.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteCopyTools.java
deleted file mode 100755
index 5e5504a..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteCopyTools.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import java.io.File;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-
-
-/**
- * Groups all operations that do data transference between remote and local
- * host.
- * 
- * @author Daniel Felix Ferber, Richard Maciel
- * 
- * NOTE: this interface should not normally be used directly
- * @see org.eclipse.ptp.remote.core.IRemoteFileManager
- */
-public interface IRemoteCopyTools {
-	
-	public void downloadFileToDir(String remotePath, File localDir) throws RemoteConnectionException, CancelException, RemoteOperationException;
-
-	public void downloadFileToDir(String remotePath, String localPah) throws RemoteConnectionException, CancelException, RemoteOperationException;
-
-	public void downloadFileToFile(String remotePath, File localFile) throws RemoteConnectionException, CancelException, RemoteOperationException;
-
-	public void downloadFileToFile(String remotePath, String localPath) throws RemoteConnectionException, CancelException, RemoteOperationException;
-
-	public void uploadFileToDir(File localFile, String remotePath) throws RemoteConnectionException, CancelException, RemoteOperationException;
-
-	public void uploadFileToDir(String localPath, String remotePath) throws RemoteConnectionException, CancelException, RemoteOperationException;
-
-	public void uploadFileToFile(File localFile, String remotePath) throws RemoteConnectionException, CancelException, RemoteOperationException;
-
-	public void uploadFileToFile(String localPath, String remotePath) throws RemoteConnectionException, CancelException, RemoteOperationException;
-
-	/**
-	 * @deprecated This method is not supported anymore. It will not be tested in future versions of RemoteTools.
-	 * It will be replaced by better mechanisms to walk and copy recursively through the file system.
-	 */
-	public void downloadDirToDir(String remotePath, File localDir, boolean recursive) throws RemoteConnectionException, RemoteOperationException, CancelException;
-
-	/**
-	 * @deprecated This method is not supported anymore. It will not be tested in future versions of RemoteTools.
-	 * It will be replaced by better mechanisms to walk and copy recursively through the file system.
-	 */
-	public void downloadDirToDir(String remotePath, String localPath, boolean recursive) throws RemoteConnectionException, RemoteOperationException, CancelException;
-
-	/**
-	 * @throws RemoteOperationException 
-	 * @deprecated This method is not supported anymore. It will not be tested in future versions of RemoteTools.
-	 * It will be replaced by better mechanisms to walk and copy recursively through the file system.
-	 */
-	public void uploadDirToDir(File localDir, String remotePath, boolean recursive) throws RemoteConnectionException, CancelException, RemoteOperationException;
-
-	/**
-	 * @deprecated This method is not supported anymore. It will not be tested in future versions of RemoteTools.
-	 * It will be replaced by better mechanisms to walk and copy recursively through the file system.
-	 */
-	public void uploadDirToDir(String localPath, String remotePath, boolean recursive) throws RemoteConnectionException, RemoteOperationException, CancelException;
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteDownloadExecution.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteDownloadExecution.java
deleted file mode 100755
index 0ce92d0..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteDownloadExecution.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-public interface IRemoteDownloadExecution extends IRemoteOperation {
-	/**
-	 * Process return exit status.
-	 */
-	public int getReturnCode();
-	
-	/**
-	 * Get the output stream that writes to the remote file.
-	 */
-	public InputStream getInputStreamFromProcessRemoteFile() throws IOException;
-	
-	public String getErrorMessage();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteExecutionManager.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteExecutionManager.java
deleted file mode 100755
index a9b98d7..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteExecutionManager.java
+++ /dev/null

@@ -1,84 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.LocalPortBoundException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-
-
-/**
- * Provides service to run commands on the remote host and to transfer files from/to the remote host. 
- * <p>>
- * Adds functionality for blocking operations until they finish execution.
- * Allows canceling the hole manager, that will cancel all current operation by raising CancelException
- * on each of them..
- * <p>
- * All paths MUST be specified as full absolute paths.
- * <p>
- * 
- * @author Richard Maciel, Daniel F. Ferber
- * @since 1.1
- * 
- * NOTE: this interface should not normally be used directly
- * @see org.eclipse.ptp.remote.core.IRemoteProcessBuilder
- */
-public interface IRemoteExecutionManager {
-	/**
-	 * Cancels the all current scripts on execution at the remote machine that were created by this manager.
-	 * Also cancels current file transfer operations.
-	 * Does not allow any further operations.
-	 */
-	public void cancel();
-	/**
-	 * Removes the cancel conditions and allows further operations again.
-	 */
-	public void resetCancel();
-	
-	/**
-	 * Free allocated resources for the execution.
-	 */
-	public void close();
-
-	public IRemoteFileTools getRemoteFileTools() throws RemoteConnectionException;
-	public IRemoteCopyTools getRemoteCopyTools() throws RemoteConnectionException;
-	public IRemoteExecutionTools getExecutionTools() throws RemoteConnectionException;
-	
-	public IRemotePathTools getRemotePathTools();
-		
-	public IRemoteStatusTools getRemoteStatusTools() throws RemoteConnectionException;
-
-	public IRemotePortForwardingTools getPortForwardingTools() throws RemoteConnectionException;
-	
-	/**
-	 * Create and bind a tunnel from localhost port to a given remotehost port.
-	 * This methods allocs the localhost port automatically.
-	 * 
-	 * @param addressOnRemoteHost Remote Host address
-	 * @param portOnRemoteHost Remote Host port
-	 * @return An IRemoteTunnel object representing the created tunnel
-	 * @throws RemoteConnectionException
-	 * @throws LocalPortBoundException No local port available to connect.
-	 * @throws CancelException 
-	 * (this method should be deprecated in future and moved to IRemotePortForwardingTools)
-	 */
-	public IRemoteTunnel createTunnel(String addressOnRemoteHost, int portOnRemoteHost) throws RemoteConnectionException, LocalPortBoundException, CancelException;
-	/*
-	 * (this method should be deprecated in future and moved to IRemotePortForwardingTools)
-	 */
-	public IRemoteTunnel createTunnel(int localPort, String addressOnRemoteHost, int portOnRemoteHost) throws RemoteConnectionException, LocalPortBoundException, CancelException;
-	/*
-	 * (this method should be deprecated in future and moved to IRemotePortForwardingTools)
-	 */
-	public void releaseTunnel(IRemoteTunnel tunnel) throws RemoteConnectionException;
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteExecutionTools.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteExecutionTools.java
deleted file mode 100755
index 0a4c84f..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteExecutionTools.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import java.io.IOException;
-
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteExecutionException;
-
-
-/**
- * NOTE: this interface should not normally be used directly
- * @see org.eclipse.ptp.remote.core.IRemoteProcessBuilder
- */
-public interface IRemoteExecutionTools {
-	/**
-	 * Create a object that describes a bash script to be executed on the remote host.
-	 * @return a pre-configured instance of IRemoteScript
-	 */
-	public IRemoteScript createScript();
-
-	/**
-	 * Execute a bash script described by an {@link IRemoteScript}.
-	 * <p>
-	 * The script will start executing immediately, The method does not block.
-	 * <p>
-	 * The {@link IRemoteScriptExecution} instance returned by this method describes the
-	 * execution properties, completion status and its result (once finished).
-	 * The {@link IRemoteScriptExecution} has a method for blocking the current thread
-	 * until the script finishes execution and another to cancel the script individually.
-	 * 
-	 * @param remoteScript The {@link IRemoteScript} that describes the bash script to be executed
-	 * @return a proper instance of {@link IRemoteScriptExecution}. 
-	 * @throws RemoteConnectionException If not possible to request the execution on remote host. 
-	 * @throws  
-	 */
-	public IRemoteScriptExecution executeScript(IRemoteScript remoteScript) throws RemoteExecutionException, CancelException, RemoteConnectionException;
-
-	public RemoteProcess executeProcess(IRemoteScript remoteScript) throws RemoteExecutionException, CancelException, RemoteConnectionException;
-
-	/**
-	 * Run a command and wait until it finishes.
-	 * @return command exit status.
-	 */
-	public int executeWithExitValue(String command) throws RemoteExecutionException, CancelException, RemoteConnectionException;
-
-	/**
-	 * Run a command and return its output.
-	 * @throws IOException 
-	 */
-	public String executeWithOutput(String command) throws RemoteExecutionException, CancelException, RemoteConnectionException;
-
-	/**
-	 * Run a bash command. Assume that non zero exit status means error.
-	 */
-	public void executeBashCommand(String command) throws RemoteExecutionException, CancelException, RemoteConnectionException;
-}
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteFileEnumeration.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteFileEnumeration.java
deleted file mode 100755
index edc2c26..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteFileEnumeration.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import java.util.Enumeration;
-
-
-public interface IRemoteFileEnumeration extends Enumeration<IRemoteItem> {
-	public IRemoteItem nextElementAsItem();
-	public Exception nextException();
-	public boolean hasMoreExceptions();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteFileTools.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteFileTools.java
deleted file mode 100755
index 95ada3a..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteFileTools.java
+++ /dev/null

@@ -1,381 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 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 Implementation
- *     Roland Schulz, University of Tennessee
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-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;
-
-/**
- * Groups all operations about files on the remote host.
- * 
- * @author Daniel Ferber, Richard Maciel
- */
-public interface IRemoteFileTools {
-	/**
-	 * Equivalent to specifying no options
-	 */
-	public static final int NONE = 0;
-
-	/**
-	 * Append output to the end of a file
-	 */
-	public static final int APPEND = 1 << 0;
-
-	/**
-	 * Assure that a directory exists.
-	 * <p>
-	 * Works like {@link #createDirectory(String)}, but may be more efficient.
-	 * 
-	 * @param directory
-	 *            Directory that must be guaranteed to exist
-	 * @param monitor
-	 *            Progress monitor used to report operation progress to the user
-	 * @throws RemoteExecutionException
-	 *             The directory could not be created.
-	 * @throws RemoteConnectionException
-	 * @throws CancelException
-	 * @since 3.0
-	 */
-	public void assureDirectory(String directory, IProgressMonitor monitor) throws RemoteOperationException,
-			RemoteConnectionException, CancelException;
-
-	/**
-	 * @param remotePath
-	 * @return
-	 * @throws RemoteOperationException
-	 * @throws RemoteConnectionException
-	 * @throws CancelException
-	 */
-	public boolean canExecute(String remotePath) throws RemoteOperationException, RemoteConnectionException, CancelException;
-
-	/**
-	 * @param remotePath
-	 * @return
-	 * @throws RemoteOperationException
-	 * @throws RemoteConnectionException
-	 * @throws CancelException
-	 */
-	public boolean canRead(String remotePath) throws RemoteOperationException, RemoteConnectionException, CancelException;
-
-	/**
-	 * @param remotePath
-	 * @return
-	 * @throws RemoteOperationException
-	 * @throws RemoteConnectionException
-	 * @throws CancelException
-	 */
-	public boolean canWrite(String remotePath) throws RemoteOperationException, RemoteConnectionException, CancelException;
-
-	/**
-	 * Copy a file on remote host.
-	 * <p>
-	 * Create (sub)directories as necessary for the new path.
-	 * 
-	 * @param from
-	 *            Absolute path to source on remote host.
-	 * @param to
-	 *            Absolute path to destination on remote host.
-	 * @param monitor
-	 *            Progress monitor used to report operation progress to the user
-	 * @throws RemoteExecutionException
-	 *             The file could not be copied.
-	 * @throws RemoteConnectionException
-	 *             The connection failed.
-	 * @throws CancelException
-	 *             The copy operation was canceled by another thread. If the
-	 *             copy involves several files, then the copy may remain
-	 *             incomplete.
-	 * @since 3.0
-	 */
-	public void copyFile(String from, String to, IProgressMonitor monitor) throws RemoteOperationException,
-			RemoteConnectionException, CancelException;
-
-	/**
-	 * Create a new directory.
-	 * <p>
-	 * If directory exists, nothings is done. Parent directories will be created
-	 * as necessary.
-	 * 
-	 * @param directory
-	 *            Directory to be created.
-	 * @param monitor
-	 *            Progress monitor used to report operation progress to the user
-	 * @throws RemoteExecutionException
-	 *             The directory could not be created.
-	 * @throws RemoteConnectionException
-	 *             The connection failed.
-	 * @throws CancelException
-	 *             The operation was canceled by another thread.
-	 * @since 3.0
-	 */
-	public void createDirectory(String directory, IProgressMonitor monitor) throws RemoteOperationException,
-			RemoteConnectionException, CancelException;
-
-	/**
-	 * Create a new empty file.
-	 * <p>
-	 * If file exists, nothings is done.
-	 * 
-	 * @param file
-	 *            File to be created.
-	 * @param monitor
-	 *            Progress monitor used to report operation progress to the user
-	 * @throws RemoteExecutionException
-	 *             The file could not be created.
-	 * @throws RemoteConnectionException
-	 *             The connection failed.
-	 * @throws CancelException
-	 *             The operation was canceled by another thread.
-	 * @since 3.0
-	 */
-	public void createFile(String file, IProgressMonitor monitor) throws RemoteOperationException, RemoteConnectionException,
-			CancelException;
-
-	/**
-	 * @param path
-	 * @return
-	 * @throws RemoteOperationException
-	 * @throws RemoteConnectionException
-	 * @throws CancelException
-	 */
-	public IRemoteFileEnumeration createFileEnumeration(String path) throws RemoteOperationException, RemoteConnectionException,
-			CancelException;
-
-	/**
-	 * @param path
-	 * @return
-	 * @throws RemoteOperationException
-	 * @throws RemoteConnectionException
-	 * @throws CancelException
-	 */
-	public IRemoteFileEnumeration createRecursiveFileEnumeration(String path) throws RemoteOperationException,
-			RemoteConnectionException, CancelException;
-
-	/**
-	 * Convenience method to query properties of the given directory on the
-	 * remote host.
-	 * 
-	 * @param directoryPath
-	 *            Absolute path to a directory
-	 * @param monitor
-	 *            Progress monitor used to report operation progress to the user
-	 * @return A {@link IRemoteItem} object
-	 * @throws RemoteExecutionException
-	 *             The path does not exist on the remote host or is not a file.
-	 * @throws RemoteConnectionException
-	 * @throws CancelException
-	 * @throws RemoteOperationException
-	 * @since 3.0
-	 */
-	public IRemoteItem getDirectory(String directoryPath, IProgressMonitor monitor) throws RemoteConnectionException,
-			CancelException, RemoteOperationException;
-
-	/**
-	 * Convenience method to query properties of the given file on the remote
-	 * host.
-	 * 
-	 * @param filePath
-	 *            Absolute path to a file
-	 * @param monitor
-	 *            Progress monitor used to report operation progress to the user
-	 * @return A {@link IRemoteItem} object
-	 * @throws RemoteExecutionException
-	 *             The path does not exist on the remote host or is not a file.
-	 * @throws RemoteConnectionException
-	 * @throws CancelException
-	 * @throws RemoteOperationException
-	 * @since 3.0
-	 */
-	public IRemoteItem getFile(String filePath, IProgressMonitor monitor) throws RemoteConnectionException, CancelException,
-			RemoteOperationException;
-
-	/**
-	 * Get an input stream connected to a file.
-	 * 
-	 * @param file
-	 *            file name of the file
-	 * @param monitor
-	 *            progress monitor
-	 * @return InputStream that can be used to read from the file
-	 * @throws RemoteOperationException
-	 * @throws RemoteConnectionException
-	 * @throws CancelException
-	 */
-	public InputStream getInputStream(String file, IProgressMonitor monitor) throws RemoteOperationException,
-			RemoteConnectionException, CancelException;
-
-	/**
-	 * Create a representation of the remote object.
-	 * 
-	 * @param path
-	 *            string to a remote object
-	 * @return A {@link IRemoteFile} object
-	 * @throws RemoteExecutionException
-	 *             The path does not exist on the remote host or is not a file.
-	 * @throws RemoteConnectionException
-	 * @throws CancelException
-	 */
-	public IRemoteItem getItem(String path) throws RemoteConnectionException, RemoteOperationException, CancelException;
-
-	/**
-	 * Get an output stream connected to a file.
-	 * 
-	 * @param file
-	 *            file name of the file
-	 * @param options
-	 *            options to modify the behavior of the method. Legal values are
-	 *            NONE and APPEND.
-	 * @param monitor
-	 *            progress monitor
-	 * @return OutputStream that can be used to write to the file
-	 * @throws RemoteOperationException
-	 * @throws RemoteConnectionException
-	 * @throws CancelException
-	 */
-	public OutputStream getOutputStream(String file, int options, IProgressMonitor monitor) throws RemoteOperationException,
-			RemoteConnectionException, CancelException;
-
-	/**
-	 * Return an IRemoteCopyTools object
-	 * 
-	 * @throws RemoteConnectionException
-	 * @return IRemoteCopyTools
-	 */
-	public IRemoteCopyTools getRemoteCopyTools() throws RemoteConnectionException;
-
-	/**
-	 * Query if the path exists and is a directory on the remote host.
-	 * 
-	 * @param path
-	 *            path of the remote directory
-	 * @param monitor
-	 *            progress monitor used to report operation progress to the user
-	 * @return true if the remote path is a directory
-	 * @throws RemoteExecutionException
-	 * @throws RemoteConnectionException
-	 * @throws CancelException
-	 * @since 3.0
-	 */
-	public boolean hasDirectory(String path, IProgressMonitor monitor) throws RemoteOperationException, RemoteConnectionException,
-			CancelException;
-
-	/**
-	 * Query if the path exists and is a file on the remote host.
-	 * 
-	 * @param path
-	 *            path of the remote file
-	 * @param monitor
-	 *            progress monitor used to report operation progress to the user
-	 * @return true if the remote path is a file
-	 * @throws RemoteExecutionException
-	 * @throws RemoteConnectionException
-	 * @throws CancelException
-	 * @since 3.0
-	 */
-	public boolean hasFile(String path, IProgressMonitor monitor) throws RemoteOperationException, RemoteConnectionException,
-			CancelException;
-
-	/**
-	 * List all items from a given path on the remote host. If the item is a
-	 * directory, it will list all its files and directories. If the item is a
-	 * file, only list itself. The result is an array of objects that describe
-	 * the properties of the items. The properties differ according to the
-	 * nature of the item.
-	 * 
-	 * @param path
-	 *            string that represents the remote path
-	 * @param monitor
-	 *            progress monitor used to report operation progress to the user
-	 * @return An array of items of the remote path. If the item is a directory
-	 *         and it is empty, then the array is empty.
-	 * @throws RemoteExecutionException
-	 *             The path does not exist on the remote host
-	 * @throws RemoteConnectionException
-	 * @throws CancelException
-	 * @since 3.0
-	 */
-	public IRemoteItem[] listItems(String remotePath, IProgressMonitor monitor) throws RemoteConnectionException,
-			RemoteOperationException, CancelException;
-
-	/**
-	 * Move a file on remote host.
-	 * <p>
-	 * Create (sub)directories as necessary for the new path.
-	 * 
-	 * @param from
-	 *            Absolute path to source on remote host.
-	 * @param to
-	 *            Absolute path to destination on remote host.
-	 * @param monitor
-	 *            progress monitor used to report operation progress to the user
-	 * @throws RemoteExecutionException
-	 *             The file could not be moved.
-	 * @throws RemoteConnectionException
-	 *             The connection failed.
-	 * @throws CancelException
-	 *             The move operation was canceled by another thread. If the
-	 *             move involves several files, then the move may remain
-	 *             incomplete.
-	 * @since 3.0
-	 */
-	public void moveFile(String from, String to, IProgressMonitor monitor) throws RemoteOperationException,
-			RemoteConnectionException, CancelException;
-
-	/**
-	 * Delete a directory on remote host.
-	 * <p>
-	 * The directory and all it's sub-directories will be removed
-	 * 
-	 * @param file
-	 *            Absolute path of the directory to be deleted.
-	 * @param monitor
-	 *            progress monitor used to report operation progress to the user
-	 * @throws RemoteExecutionException
-	 *             The directory could not be deleted.
-	 * @throws RemoteConnectionException
-	 *             The connection failed.
-	 * @throws CancelException
-	 *             The remove operation was canceled by another thread. The
-	 *             file(s) may have been all removed, partially not removed or
-	 *             not removed at all.
-	 * @since 3.0
-	 */
-	public void removeDirectory(String dir, IProgressMonitor monitor) throws RemoteOperationException, RemoteConnectionException,
-			CancelException;
-
-	/**
-	 * Delete a file on remote host.
-	 * 
-	 * @param file
-	 *            Absolute path of thefile to be deleted.
-	 * @param monitor
-	 *            progress monitor used to report operation progress to the user
-	 * @throws RemoteExecutionException
-	 *             The file could not be deleted.
-	 * @throws RemoteConnectionException
-	 *             The connection failed.
-	 * @throws CancelException
-	 *             The remove operation was canceled by another thread. The
-	 *             file(s) may have been all removed, partially not removed or
-	 *             not removed at all.
-	 * @since 3.0
-	 */
-	public void removeFile(String file, IProgressMonitor monitor) throws RemoteOperationException, RemoteConnectionException,
-			CancelException;
-}
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteItem.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteItem.java
deleted file mode 100755
index 6142d75..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteItem.java
+++ /dev/null

@@ -1,145 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 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 Implementation
- *     Roland Schulz, University of Tennessee
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-
-/**
- * @author richardm
- * 
- */
-public interface IRemoteItem {
-
-	/**
-	 * Apply all the attributes to the item on remote host. For efficiency, only
-	 * changed attributes may be written.
-	 * 
-	 * @param monitor
-	 *            progress monitor used to report operation progress to the user
-	 * @since 3.0
-	 */
-	public void commitAttributes(IProgressMonitor monitor) throws RemoteConnectionException, RemoteOperationException,
-			CancelException;
-
-	/**
-	 * Test if this remote item actually exists on the remote system.
-	 * 
-	 * @return true if the remote item exists
-	 */
-	public boolean exists();
-
-	/**
-	 * Get the last accessed time of the item
-	 * 
-	 * @return last access time
-	 */
-	public long getAccessTime();
-
-	/**
-	 * Get the modification time of the item.
-	 * 
-	 * @return last modified time
-	 */
-	public long getModificationTime();
-
-	/**
-	 * Get the path represented by this item.
-	 * 
-	 * @return path
-	 */
-	public String getPath();
-
-	/**
-	 * Get the item size in bytes.
-	 * 
-	 * @return item size in bytes
-	 */
-	public long getSize();
-
-	/**
-	 * Tests if the remote item is a directory.
-	 * 
-	 * @return true if the remote item is a directory
-	 */
-	public boolean isDirectory();
-
-	/**
-	 * Test if the remote item is executable (accessible for a directory)
-	 * 
-	 * @return true if the remote imtem is executable
-	 */
-	public boolean isExecutable();
-
-	/**
-	 * Returns true if the remote item has a permission that allows to read this
-	 * item. Several permissions are considered (user, group, others) to
-	 * calculate the effective permission.
-	 * 
-	 * @return true/false
-	 */
-	public boolean isReadable();
-
-	/**
-	 * Returns true if the remote item has a permission that allows to write
-	 * this item. Several permissions are considered (user, group, others) to
-	 * calculate the effective permission.
-	 * 
-	 * @return false
-	 */
-	public boolean isWritable();
-
-	/**
-	 * Fetch all the attributes from the item on remote host.
-	 * 
-	 * @param monitor
-	 *            progress monitor used to report operation progress to the user
-	 * @throws RemoteOperationException
-	 * @since 3.0
-	 */
-	public void refreshAttributes(IProgressMonitor monitor) throws RemoteConnectionException, RemoteOperationException,
-			CancelException;
-
-	/**
-	 * Set the executable status of the remote item
-	 * 
-	 * @param flag
-	 *            true if the remote item is executable
-	 */
-	public void setExecutable(boolean flag);
-
-	/**
-	 * Set the modification time of the item
-	 * 
-	 * @param time
-	 *            modification time
-	 */
-	public void setModificationTime(long time);
-
-	/**
-	 * Set the permission on the remote item enable/disable read access.
-	 * 
-	 * @param flag
-	 */
-	public void setReadable(boolean flag);
-
-	/**
-	 * Set the permission on the remote item to enable/disable write access.
-	 * 
-	 * @param flag
-	 */
-	public void setWriteable(boolean flag);
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteOperation.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteOperation.java
deleted file mode 100755
index fcc4df6..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteOperation.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteExecutionException;
-
-/**
- * The common interface to all operations that can be executed on the remote host and that
- * may require time to finish.
- * <p>
- * Allows to block the current thread until the operation finishes on the remote host.
- * Allows to cancel the operation on the remote host (not all operation may implement this).
- * @author Richard Maciel, Daniel Felix Ferber
- * <b>Review OK.</b>
- */
-public interface IRemoteOperation
-{	
-	/**
-	 * Wait until the operation is finished or until
-	 * Canceled by another thread.
-	 * if canceled, then the result of the execution will probably be undefined.
-	 * 
-	 * @throws RemoteConnectionException
-	 *             The connection failed.
-	 * @throws CancelException
-	 *             The script execution was canceled by another thread.
-	 */
-	public void waitForEndOfExecution() throws RemoteConnectionException, CancelException, RemoteExecutionException;
-
-	/**
-	 * Check if the operation finished because it was canceled.
-	 * @return True if the last operation was canceled.
-	 */
-	public boolean wasCanceled();
-
-	/**
-	 * Use this method to verify if the operation on the remote host did already finish or not.
-	 * @return true if the operation finished execution.
-	 */
-	public boolean wasFinished();
-	
-	/**
-	 * Cancel the operation on the remote host.
-	 */
-	public void cancel();
-
-
-	/**
-	 * Free allocated resources for the execution.
-	 */
-	public void close();
-	
-	
-	/**
-	 * Return the meaning of the exit value.
-	 */
-	public int getFinishStatus();
-	
-	/**
-	 * Get a text that describes the finish status code.
-	 */
-	public String getFinishStatusText(int status);
-
-	public boolean isException(int status);
-	public boolean isOK(int status);
-	public boolean isExecutableError(int status);
-	
-	public boolean wasException();
-	public boolean wasOK();
-	public boolean wasCommandError();
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemotePathTools.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemotePathTools.java
deleted file mode 100755
index f79bf4f..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemotePathTools.java
+++ /dev/null

@@ -1,36 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-public interface IRemotePathTools {
-
-	public String rootPath();
-
-	public boolean isRoot(String path);
-
-	public boolean isAbsolute(String path);
-
-	public boolean isRelative(String path);
-
-	public boolean isLeave(String path);
-
-	public String leave(String path);
-
-	public String canonicalize(String path);
-
-	public String join(String base, String path);
-
-	public String parent(String path);
-	
-	public String quote(String path, boolean full);
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemotePortForwarding.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemotePortForwarding.java
deleted file mode 100644
index 862c8ea..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemotePortForwarding.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-/**
- * Represents a remote port forwarding created by {@link IRemotePortForwardingTools}.
- * <p>
- * The remote port is forwarded to a host:port accessibly to the local host.
- * <p>
- * Check inherited {@link IPortForwarding} for more methods.
- */
-public interface IRemotePortForwarding extends IPortForwarding {
-	/** The port on the host where the remote port is forwarded to. */
-	public abstract int getLocalPort();
-
-	/** The host where the remote port is forwarded to. */
-	public abstract String getLocalAddress();
-
-	/** The remote port that is being forwarded. */
-	public abstract int getRemotePort();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemotePortForwardingTools.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemotePortForwardingTools.java
deleted file mode 100644
index 285f9b9..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemotePortForwardingTools.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.PortForwardingException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-
-
-public interface IRemotePortForwardingTools {
-	public IRemotePortForwarding forwardRemotePort(int remotePort, int localPort) throws RemoteConnectionException, PortForwardingException, CancelException;
-	public IRemotePortForwarding forwardRemotePort(int remotePort, String localAddress, int localPort) throws RemoteConnectionException, PortForwardingException, CancelException;
-
-//	public LocalPortForwarding forwardLocalPort(int localPort, int remotePort) throws RemoteConnectionException;
-//	public LocalPortForwarding forwardLocalPort(int localPort, String remoteAddress, int remotePort) throws RemoteConnectionException;
-
-	public void releaseForwarding(IPortForwarding forwading) throws RemoteConnectionException, PortForwardingException;
-	
-	public IRemotePortForwarding getRemotePortForwarding(int remotePort) throws RemoteConnectionException, PortForwardingException;
-//	public LocalPortForwarding getLocalPortForwarding(int localPort);
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteScript.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteScript.java
deleted file mode 100755
index fb879f7..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteScript.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * Bean that holds configuration for a script that is to run remotely.
- * @author Richard Maciel, Daniel Ferber
- * @since 1.1
- * <b>Review OK</b>.
- */
-public interface IRemoteScript
-{
-	/**
-	 * Add an environment variable to be used by the script..
-	 * @param variable Variable name and value, informed as string like "variable=value"
-	 */
-	public void addEnvironment(String variable);
-	public void addEnvironment(String[] environment);
-	
-	/**
-	 * Set process input stream. Process stdin will read from this stream.
-	 * <p>
-	 * If not set, or if set to <code>null</code>, then the remote execution
-	 * will create an outputstream where one may write data to the process stdin.
-	 * (see {@link IRemoteExecution.getOutputStreamToProcessInputStream()).
-	 * @param input Input stream or null to run without input.
-	 */
-	public void setProcessInputStream(InputStream input);
-
-	/**
-	 * Set process output stream. Process stdout will write to this stream.
-	 * <p>
-	 * If not set, or if set to <code>null</code>, then the remote execution
-	 * will create an inputstream where one may read data that the process has
-	 * written to stdout.
-	 * (see {@link IRemoteExecution.getInputStreamFromProcessOutputStream()).
-	 * @param input Input stream or null to run without input.
-	 */
-	public void setProcessOutputStream(OutputStream output);
-
-	/**
-	 * Set process error stream. Process stdout will write to this stream.
-	 * <p>
-	 * If not set, or if set to <code>null</code>, then the remote execution
-	 * will create an inputstream where one may read data that the process has
-	 * written to stderr.
-	 * (see {@link IRemoteExecution.getInputStreamFromProcessErrorStream()).
-	 * @param input Input stream or null to run without input.
-	 */
-	public void setProcessErrorStream(OutputStream output);
-
-	/**
-	 * Set if X11 of the script will be forwarded to local host.
-	 * @param willForward
-	 */
-	public void setForwardX11(boolean willForward);
-	
-	/**
-	 * Set a single bash command that will be run as script.
-	 * @param script A bash script command.
-	 */
-	public void setScript(String script);
-	
-	/**
-	 * Set a bash script (list of sequential commands) to be run.
-	 * The script may contain while/for/if/switch construction.
-	 * @param script An array of bash script lines.
-	 */
-	public void setScript(String [] script);
-	
-	public void setFetchProcessOutputStream(boolean flag);
-	public void setFetchProcessErrorStream(boolean flag);
-	public void setFetchProcessInputStream(boolean flag);
-	
-	public void setAllocateTerminal(boolean flag);
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteScriptExecution.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteScriptExecution.java
deleted file mode 100755
index 54b2d66..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteScriptExecution.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-
-public interface IRemoteScriptExecution extends IRemoteOperation
-{	
-	/**
-	 * Process return exit status.
-	 */
-	public int getReturnCode();
-	
-	/**
-	 * Get the input stream (user's perspective)
-	 * @throws IOException 
-	 * 
-	 */
-	public InputStream getInputStreamFromProcessOutputStream() throws IOException;
-	
-	/**
-	 * Get the input stream (user's perspective)
-	 * @throws IOException 
-	 * 
-	 */
-	public InputStream getInputStreamFromProcessErrorStream() throws IOException;
-
-	/**
-	 * Get the output stream (user's perspective)
-	 * 
-	 */
-	public OutputStream getOutputStreamToProcessInputStream() throws IOException;
-	
-	/**
-	 * Free allocated resources for the execution.
-	 */
-	public void close();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteStatusTools.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteStatusTools.java
deleted file mode 100755
index 10ac937..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteStatusTools.java
+++ /dev/null

@@ -1,89 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import java.util.Set;
-
-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;
-
-
-/**
- * Provides access to several status for the Host and Remote machines
- * 
- * @author Richard Maciel
- *
- */
-public interface IRemoteStatusTools {
-	/**
-	 * TCP protocol identification constant
-	 */
-	public static final int PROTO_TCP = 0;
-	/**
-	 * UDP protocol identification constant
-	 */
-	public static final int PROTO_UDP = 1;
-	
-	/**
-	 * Returns a @link{Set} containing alloc'ed port numbers for the given
-	 * protocol.
-	 * This method considers that hosts which support both ipv4 and ipv6 
-	 * has a single stack to handle both protocols.
-	 * 
-	 * @param protocol Transport protocol where the list of alloc'ed ports will come from 
-	 * @return True if the port is in use, false otherwise.
-	 * @throws RemoteConnectionException 
-	 * @throws RemoteExecutionException 
-	 * @throws RemoteOperationException 
-	 * @throws CancelException 
-	 */
-	public Set<Integer> getRemotePortsInUse(int protocol) throws RemoteConnectionException, RemoteOperationException, CancelException;
-
-	/**
-	 * Return the username of the user who logged into the system.
-	 * 
-	 * @return String containing the username.
-	 * @throws CancelException 
-	 * @throws RemoteOperationException 
-	 * @throws RemoteConnectionException 
-	 */
-	public String getUsername() throws RemoteConnectionException, RemoteOperationException, CancelException;
-	
-	/**
-	 * Return the user id of the user who logged into the system.
-	 * 
-	 * @return int containing the user id
-	 * @throws CancelException 
-	 * @throws RemoteOperationException 
-	 * @throws RemoteConnectionException 
-	 */
-	public int getUserID() throws RemoteConnectionException, RemoteOperationException, CancelException;
-	
-	/**
-	 * Return a {@link Set} of group ids for which the user belongs
-	 *  
-	 * @return Set containing the group ids (stored as Integer)
-	 * @throws CancelException 
-	 * @throws RemoteOperationException 
-	 * @throws RemoteConnectionException 
-	 */
-	public Set<Integer> getGroupIDSet() throws RemoteConnectionException, RemoteOperationException, CancelException;
-	
-	public long getTime() throws RemoteConnectionException, RemoteOperationException, CancelException;
-	/*
-	 * TODO: To the next version, add some methods to extract cpu info, memory size, disk size...
-	 * 
-	 * 
-	 */
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteTunnel.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteTunnel.java
deleted file mode 100755
index 11827a4..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteTunnel.java
+++ /dev/null

@@ -1,16 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-public interface IRemoteTunnel {
-	public int getLocalPort();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteUploadExecution.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteUploadExecution.java
deleted file mode 100755
index c32d7e2..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/IRemoteUploadExecution.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-public interface IRemoteUploadExecution extends IRemoteOperation {
-	/**
-	 * Process return exit status.
-	 */
-	public int getReturnCode();
-	
-	/**
-	 * Get the output stream that writes to the remote file.
-	 */
-	public OutputStream getOutputStreamToProcessRemoteFile() throws IOException;
-	
-	public String getErrorMessage();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/KeyAuthToken.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/KeyAuthToken.java
deleted file mode 100755
index 85d2963..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/KeyAuthToken.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-import java.io.File;
-
-/**
- * @author Richard Maciel
- *
- */
-public class KeyAuthToken extends AuthToken {
-	private String passphrase;
-	private File keyPath;
-
-	public KeyAuthToken(String username, File keyPath, String passphrase) {
-		super(username);
-		this.passphrase = passphrase;
-		this.keyPath = keyPath;
-	}
-	
-	public String getPassphrase() {
-		return passphrase;
-	}
-
-	public void setPassphrase(String passphrase) {
-		this.passphrase = passphrase;
-	}
-
-	public File getKeyPath() {
-		return keyPath;
-	}
-
-	public void setKeyPath(File keyPath) {
-		this.keyPath = keyPath;
-	}
-	
-	
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/PasswdAuthToken.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/PasswdAuthToken.java
deleted file mode 100755
index 1eff0f7..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/PasswdAuthToken.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-/**
- * @author Richard Maciel
- *
- */
-public class PasswdAuthToken extends AuthToken {
-	private String password;
-	
-	public PasswdAuthToken(String username, String password) {
-		super(username);
-		this.password = password;
-	}
-
-	public String getPassword() {
-		return password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-	
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/RemoteProcess.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/RemoteProcess.java
deleted file mode 100755
index 5e727bf..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/RemoteProcess.java
+++ /dev/null

@@ -1,17 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core;
-
-
-public abstract class RemoteProcess extends Process {
-	public abstract IRemoteScriptExecution getRemoteExecution();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/messages/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/messages/Messages.java
deleted file mode 100755
index b2ade4a..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/messages/Messages.java
+++ /dev/null

@@ -1,144 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remotetools.core.messages.messages"; //$NON-NLS-1$
-
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-
-	public static String Connection_0;
-	public static String Connection_1;
-	public static String Connection_2;
-	public static String Connection_AuthenticationTypeNotSupported;
-	public static String Connection_Connect_FailedConnect;
-	public static String Connection_Connect_FailedUnsupportedKeySize;
-	public static String Connection_Connect_FailedCreateControlChannel;
-	public static String Connection_Connect_FailedCreateSession;
-	public static String Connection_Connect_FailedCreateSFTPConnection;
-	public static String Connection_Connect_InvalidPrivateKey;
-	public static String Connection_CreateConnectionSlot_FailedConnectNewSession;
-	public static String Connection_CreateConnectionSlot_FailedCreateNewSession;
-	public static String Connection_CreateExecChannel_FailedCreateNewExecChannel;
-	public static String Connection_CreateTunnel_FailedCreateTunnel;
-	public static String Connection_CreateTunnel_TunnelPortAlreadyAlloced;
-	public static String Connection_Operation_cancelled_by_user;
-	public static String Connection_ReleaseTunnel_FailedRemoveTunnel;
-	public static String Connection_ReleaseTunnel_PortNotAllocedForTunnel;
-	public static String Connection_SetCipherType_CipherNotSupported;
-	public static String Connection_Timeout;
-	public static String ControlChannel_0;
-	public static String ControlChannel_Debug_ControlConnectionReceived;
-	public static String ControlChannel_Debug_ReceivedControlTerminalPath;
-	public static String ControlChannel_Debug_StartedWaitingControlTerminalPath;
-	public static String ControlChannel_Open_FailedCreateAuxiliaryShell;
-	public static String ControlChannel_Open_FailedCreateIOStream;
-	public static String ControlChannel_Open_FailedSendInitCommands;
-	public static String ControlChannel_Open_WaitControlTerminalPathInterrupted;
-	public static String CopyTools_0;
-	public static String CopyTools_doDownloadFileToFile_CannotWriteFile;
-	public static String CopyTools_doDownloadFileToFile_CommandFailes;
-	public static String CopyTools_doDownloadFileToFile_ExecutionFailed;
-	public static String CopyTools_doUploadFileFromFile_CannotReadFile;
-	public static String CopyTools_doUploadFileFromFile_CommandFailed;
-	public static String CopyTools_doUploadFileFromFile_ExecutionFailed;
-	public static String DownloadExecution_DownloadExecution_FailedCreateDownload;
-	public static String ExecutionManager_CreateTunnel_AllLocalPortsBusy;
-	public static String ExecutionObserver_ExecutionObserver_RemoteCommandObserver;
-	public static String ExecutionTools_ExecuteBashCommand_FailedRunBashCommand;
-	public static String FileTools_0;
-	public static String FileTools_1;
-	public static String FileTools_10;
-	public static String FileTools_11;
-	public static String FileTools_12;
-	public static String FileTools_13;
-	public static String FileTools_14;
-	public static String FileTools_15;
-	public static String FileTools_2;
-	public static String FileTools_3;
-	public static String FileTools_4;
-	public static String FileTools_5;
-	public static String FileTools_6;
-	public static String FileTools_7;
-	public static String FileTools_8;
-	public static String FileTools_9;
-	public static String KillableExecution_Debug_1;
-	public static String KillableExecution_FinishStatus_AlarmClock;
-	public static String KillableExecution_FinishStatus_BackgroundProcessReadTTY;
-	public static String KillableExecution_FinishStatus_BackgroundWriteTTY;
-	public static String KillableExecution_FinishStatus_BrokenPipe;
-	public static String KillableExecution_FinishStatus_BUSError;
-	public static String KillableExecution_FinishStatus_ChildProcessStoppedOrExited;
-	public static String KillableExecution_FinishStatus_CommandNotFound;
-	public static String KillableExecution_FinishStatus_ContinueExecuting;
-	public static String KillableExecution_FinishStatus_CPULimitExceeded;
-	public static String KillableExecution_FinishStatus_Error;
-	public static String KillableExecution_FinishStatus_FileSizeLimitExceeded;
-	public static String KillableExecution_FinishStatus_FloatingPointException;
-	public static String KillableExecution_FinishStatus_Hangup;
-	public static String KillableExecution_FinishStatus_IllegalInstruction;
-	public static String KillableExecution_FinishStatus_InvalidExitCode;
-	public static String KillableExecution_FinishStatus_InvalidMemorySegmentAccess;
-	public static String KillableExecution_FinishStatus_IOPossible;
-	public static String KillableExecution_FinishStatus_IOTTrap;
-	public static String KillableExecution_FinishStatus_Kill;
-	public static String KillableExecution_FinishStatus_NotExecutable;
-	public static String KillableExecution_FinishStatus_Ok;
-	public static String KillableExecution_FinishStatus_PowerFailureRestart;
-	public static String KillableExecution_FinishStatus_ProfilingAlarmClock;
-	public static String KillableExecution_FinishStatus_StackFault;
-	public static String KillableExecution_FinishStatus_StopExecuting;
-	public static String KillableExecution_FinishStatus_TerminalInterrupt;
-	public static String KillableExecution_FinishStatus_TerminalQuit;
-	public static String KillableExecution_FinishStatus_TerminalStopSignal;
-	public static String KillableExecution_FinishStatus_Termination;
-	public static String KillableExecution_FinishStatus_TraceTrap;
-	public static String KillableExecution_FinishStatus_Unknown;
-	public static String KillableExecution_FinishStatus_UrgentConditionSocket;
-	public static String KillableExecution_FinishStatus_UserDefinedSignal1;
-	public static String KillableExecution_FinishStatus_UserDefinedSignal2;
-	public static String KillableExecution_FinishStatus_VirtualAlarmClock;
-	public static String KillableExecution_FinishStatus_WindowSizeChange;
-	public static String KillableExecution_ScriptExecutionConnectionException;
-	public static String PathTools_47;
-	public static String PortForwardingException_0;
-	public static String PortForwardingException_1;
-	public static String PortForwardingException_2;
-	public static String PortForwardingException_3;
-	public static String RemoteExecutionException_0;
-	public static String RemoteExecutionException_1;
-	public static String RemoteFileTools_FailedSetPermission;
-	public static String RemoteFileTools_FetchRemoteAttr_FailedFetchAttr;
-	public static String RemoteFileTools_GetItem_PathNotExist;
-	public static String RemoteFileTools_GetItemsPath_FailedListRemoteFiles;
-	public static String RemoteFileTools_ListFiles_FailedListRemote;
-	public static String RemoteFileTools_UploadPermissions_FailedSetPermissions;
-	public static String RemoteFileTools_ValidateLocalDir_NotValid;
-	public static String RemoteFileTools_ValidateLocalFile_NotValid;
-	public static String RemoteFileTools_ValidateLocalItem_DoesNotExist;
-	public static String RemoteFileTools_ValidateRemoteDir_NotValid;
-	public static String RemoteFileTools_ValidateRemoteFile_NotValid;
-	public static String RemoteFileTools_ValidateRemotePath_NotValid;
-	public static String RemoteStatusTools_GetPasswdFields_NoUsernameInPasswdFile;
-	public static String RemoteFileTools_CreateDirectory_FileNameExists;
-	public static String RemotePortForwarding_0;
-	public static String ScriptExecution_StartExecution_FailedInitStreams;
-	public static String UploadExecution_StartExecution_FailedCreateUpload;
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/messages/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/messages/messages.properties
deleted file mode 100755
index 6764a51..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/core/messages/messages.properties
+++ /dev/null

@@ -1,131 +0,0 @@
-###############################################################################
-# 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
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-KillableExecution_ScriptExecutionConnectionException=Failed to start to execute script
-KillableExecution_Debug_1=Using command line: 
-KillableExecution_FinishStatus_Ok=Application finished successfully
-KillableExecution_FinishStatus_Error=Application finished with error code
-KillableExecution_FinishStatus_NotExecutable=Command is not an executable
-KillableExecution_FinishStatus_CommandNotFound=Command not found
-KillableExecution_FinishStatus_InvalidExitCode=Invalid exit code
-KillableExecution_FinishStatus_Hangup=Hangup (POSIX)
-KillableExecution_FinishStatus_TerminalInterrupt=Terminal interrupt (ANSI)
-KillableExecution_FinishStatus_TerminalQuit=Terminal quit (POSIX)
-KillableExecution_FinishStatus_IllegalInstruction=Illegal instruction (ANSI)
-KillableExecution_FinishStatus_TraceTrap=Trace trap (POSIX)
-KillableExecution_FinishStatus_IOTTrap=IOT Trap (4.2 BSD)
-KillableExecution_FinishStatus_BUSError=BUS error (4.2 BSD)
-KillableExecution_FinishStatus_FloatingPointException=Floating point exception (ANSI)
-KillableExecution_FinishStatus_Kill=Kill(can't be caught or ignored) (POSIX)
-KillableExecution_FinishStatus_UserDefinedSignal1=User defined signal 1 (POSIX)
-KillableExecution_FinishStatus_InvalidMemorySegmentAccess=Invalid memory segment access (ANSI)
-KillableExecution_FinishStatus_UserDefinedSignal2=User defined signal 2 (POSIX)
-KillableExecution_FinishStatus_BrokenPipe=Write on a pipe with no reader, Broken pipe (POSIX)
-KillableExecution_FinishStatus_AlarmClock=Alarm clock (POSIX)
-KillableExecution_FinishStatus_Termination=Termination (ANSI)
-KillableExecution_FinishStatus_StackFault=Stack fault
-KillableExecution_FinishStatus_ChildProcessStoppedOrExited=Child process has stopped or exited, changed (POSIX)
-KillableExecution_FinishStatus_ContinueExecuting=Continue executing, if stopped (POSIX)
-KillableExecution_FinishStatus_StopExecuting=Stop executing(can't be caught or ignored) (POSIX)
-KillableExecution_FinishStatus_TerminalStopSignal=Terminal stop signal (POSIX)
-KillableExecution_FinishStatus_BackgroundProcessReadTTY=Background process trying to read, from TTY (POSIX)
-KillableExecution_FinishStatus_BackgroundWriteTTY=Background process trying to write, to TTY (POSIX)
-KillableExecution_FinishStatus_UrgentConditionSocket=Urgent condition on socket (4.2 BSD)
-KillableExecution_FinishStatus_CPULimitExceeded=CPU limit exceeded (4.2 BSD)
-KillableExecution_FinishStatus_FileSizeLimitExceeded=File size limit exceeded (4.2 BSD)
-KillableExecution_FinishStatus_VirtualAlarmClock=Virtual alarm clock (4.2 BSD)
-KillableExecution_FinishStatus_ProfilingAlarmClock=Profiling alarm clock (4.2 BSD)
-KillableExecution_FinishStatus_WindowSizeChange=Window size change (4.3 BSD, Sun)
-KillableExecution_FinishStatus_IOPossible=I/O now possible (4.2 BSD)
-KillableExecution_FinishStatus_PowerFailureRestart=Power failure restart (System V)
-KillableExecution_FinishStatus_Unknown=Unknown
-
-Connection_0=SSH connection to remote host was lost
-Connection_1=Control channel connection to remote host was lost
-Connection_2=Opening SFTP connection failed. Does the remote machine support SFTP? 
-Connection_AuthenticationTypeNotSupported=Authentication type not supported\!
-ControlChannel_0=Found control terminal path = 
-ControlChannel_Open_FailedCreateIOStream=Failed to create input/outputstream for auxiliary shell in ssh.ControlConnection
-Connection_Connect_InvalidPrivateKey=Invalid private key
-Connection_Connect_FailedCreateSession=Failed to create session
-Connection_Connect_FailedConnect=Unable to connect to host {0}
-Connection_Connect_FailedCreateControlChannel=Failed to create control channel
-Connection_Connect_FailedCreateSFTPConnection=Failed to create SFTP connection for ssh.ExecutionManager
-Connection_Connect_FailedUnsupportedKeySize=Unsupported Keysize
-
-CopyTools_0=Failed to create local directory {0}
-CopyTools_DownloadFileFile_FailedDownloadFile=Failed to download file: 
-CopyTools_doDownloadFileToFile_CannotWriteFile=Download cannot write to local file ({0})
-CopyTools_doDownloadFileToFile_ExecutionFailed=Execution of download failed ({0})
-CopyTools_doDownloadFileToFile_CommandFailes=Download command failed on remote host (exit value {0})
-CopyTools_doUploadFileFromFile_CannotReadFile=Upload cannot read local file ({0})
-CopyTools_doUploadFileFromFile_ExecutionFailed=Execution of upload failed ({0})
-CopyTools_doUploadFileFromFile_CommandFailed=Upload command failed on remote host (exit value {0})
-ControlChannel_Open_FailedCreateAuxiliaryShell=Failed to create auxiliary shell for ssh.ControlConnection
-ControlChannel_Debug_ControlConnectionReceived=Control connection received: 
-Connection_CreateExecChannel_FailedCreateNewExecChannel=Failed to create new execution channel
-Connection_CreateTunnel_TunnelPortAlreadyAlloced=Failed to create tunnel, since port is already allocated for a tunnel
-Connection_CreateTunnel_FailedCreateTunnel=Failed to create tunnel
-ControlChannel_Open_FailedSendInitCommands=Failed to send initialization commands to auxiliary shell
-Connection_ReleaseTunnel_PortNotAllocedForTunnel=Failed to remove tunnel, since port is not allocated for a tunnel
-ControlChannel_Debug_ReceivedControlTerminalPath=Received controlTerminalPath: 
-Connection_ReleaseTunnel_FailedRemoveTunnel=Failed to remove tunnel
-Connection_CreateConnectionSlot_FailedCreateNewSession=Failed to create new session for more execution channels
-ControlChannel_Debug_StartedWaitingControlTerminalPath=Started waiting for controlTerminalPath
-ControlChannel_Open_WaitControlTerminalPathInterrupted=Wait for controlTerminalPath was interrupted
-Connection_CreateConnectionSlot_FailedConnectNewSession=Failed to connect to new session for more execution channels
-Connection_Operation_cancelled_by_user=Operation cancelled by user
-Connection_SetCipherType_CipherNotSupported=Cipher not supported
-Connection_Timeout=Timeout connecting to host
-
-DownloadExecution_DownloadExecution_FailedCreateDownload=Failed to create download
-ExecutionManager_CreateTunnel_AllLocalPortsBusy=All local ports are busy.
-ExecutionObserver_ExecutionObserver_RemoteCommandObserver=RemoteCommandObserver
-ExecutionTools_ExecuteBashCommand_FailedRunBashCommand=Failed to run Bash command
-FileTools_0=Not a directory
-FileTools_1=Not a file
-FileTools_10=List items in directory
-FileTools_11=Remove directory
-FileTools_12=Remove file
-FileTools_13=Change modification time
-FileTools_14=Change modification time
-FileTools_15=Get file attributes
-FileTools_2=Change permissions
-FileTools_3=Create directory
-FileTools_4=Create file
-FileTools_5=Change modification time
-FileTools_6=Not a directory
-FileTools_7=Not a file
-FileTools_8=Download file
-FileTools_9=Upload file
-PathTools_47=a/
-PortForwardingException_0=Remote port is already forwarded on remote host.
-PortForwardingException_1=Failed to create port forwarding on remote host.
-PortForwardingException_2=Invalid parameters for port forwarding.
-PortForwardingException_3=Failed to release remote port forwarding since it is not active.
-RemoteExecutionException_0=no error information available
-RemoteExecutionException_1={0}\nExit code: {1}
-RemoteFileTools_FetchRemoteAttr_FailedFetchAttr=Failed to fetch attributes from remote file/directory
-RemoteFileTools_UploadPermissions_FailedSetPermissions=Failed to set permissions
-RemoteStatusTools_GetPasswdFields_NoUsernameInPasswdFile=Username does not exist in the passwd file\!
-RemoteFileTools_ValidateRemotePath_NotValid=\ is not a valid path on remote host
-RemoteFileTools_ValidateLocalFile_NotValid=\ is not a valid local file
-RemoteFileTools_ValidateLocalItem_DoesNotExist=\ does not exist
-RemoteFileTools_ValidateLocalDir_NotValid=\ is not a valid local directory
-RemoteFileTools_ValidateRemoteFile_NotValid=\ is not a valid remote file
-RemoteFileTools_ValidateRemoteDir_NotValid=\ is not a valid remote directory
-RemoteFileTools_ListFiles_FailedListRemote=Failed to list files on remote host
-RemoteFileTools_FailedSetPermission=Failed to set permission on remote file/directory
-RemoteFileTools_GetItemsPath_FailedListRemoteFiles=Failed to list files on remote host
-RemoteFileTools_GetItem_PathNotExist=Path does not exist
-RemoteFileTools_CreateDirectory_FileNameExists=A file of that name already exists
-RemotePortForwarding_0=remote port {0} to local {1}:{2}
-ScriptExecution_StartExecution_FailedInitStreams=Failed to initialize streams for ssh.ScriptExecution
-UploadExecution_StartExecution_FailedCreateUpload=Failed to create upload

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/CancelException.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/CancelException.java
deleted file mode 100755
index 5216982..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/CancelException.java
+++ /dev/null

@@ -1,17 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.exception;
-
-public class CancelException extends Exception {
-	private static final long serialVersionUID = 1L;
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/LocalPortBoundException.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/LocalPortBoundException.java
deleted file mode 100755
index c8d7107..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/LocalPortBoundException.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.exception;
-
-/**
- * Specific RemoteOperationException that arises when creating a tunnel 
- * that binds to a local port that is already alloc'ed.
- * 
- * @author Richard Maciel
- *
- */
-public class LocalPortBoundException extends RemoteOperationException {
-	private static final long serialVersionUID = 5497137298332719485L;
-
-	/**
-	 * @param message
-	 * @param cause
-	 */
-	public LocalPortBoundException(String message, Throwable cause) {
-		super(message, cause);
-	}
-
-	/**
-	 * @param message
-	 */
-	public LocalPortBoundException(String message) {
-		super(message);
-		// TODO Auto-generated constructor stub
-	}
-
-	/**
-	 * @param cause
-	 */
-	public LocalPortBoundException(Throwable cause) {
-		super(cause);
-		// TODO Auto-generated constructor stub
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/PortForwardingException.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/PortForwardingException.java
deleted file mode 100644
index f2bc438..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/PortForwardingException.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remotetools.exception;
-
-import org.eclipse.ptp.remotetools.core.messages.Messages;
-
-
-public class PortForwardingException extends RemoteException {
-	private static final long serialVersionUID = -2455858989206677165L;
-	
-	public static final int REMOTE_PORT_ALREADY_FORWARDED = 1;
-	public static final int REMOTE_FORWARDING_FAILED = 2;
-	public static final int INVALID_PARAMETERS = 3;
-	public static final int REMOTE_FORWARDING_NOT_ATIVE = 4;
-
-	int code;
-	
-	public PortForwardingException(int code) {
-		super();
-		this.code = code;
-	}
-	
-	public PortForwardingException(int code, Throwable e) {
-		super(e);
-		this.code = code;
-	}
-	
-	public String getMessage() {
-		switch (code) {
-		case REMOTE_PORT_ALREADY_FORWARDED:
-			return Messages.PortForwardingException_0;
-		case REMOTE_FORWARDING_FAILED:
-			return Messages.PortForwardingException_1;
-		case INVALID_PARAMETERS:
-			return Messages.PortForwardingException_2;
-		case REMOTE_FORWARDING_NOT_ATIVE:
-			return Messages.PortForwardingException_3;	
-		default:
-			assert false;
-			return null;
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteConnectionException.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteConnectionException.java
deleted file mode 100755
index 0019af30..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteConnectionException.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.exception;
-
-public class RemoteConnectionException extends RemoteException {
-	private static final long serialVersionUID = 1L;
-
-	int errorCode = UNKNOWN;
-	public static final int UNKNOWN = 0;
-	public static final int LOST_CONNECTION = 1;
-
-	public RemoteConnectionException(String message, Throwable cause) {
-		super(message, cause);
-		// TODO Auto-generated constructor stub
-	}
-
-	public RemoteConnectionException(String message) {
-		super(message);
-		// TODO Auto-generated constructor stub
-	}
-
-	public RemoteConnectionException(Throwable cause) {
-		super(cause);
-		// TODO Auto-generated constructor stub
-	}
-
-	public RemoteConnectionException(int errorCode) {
-		super();
-		this.errorCode = errorCode;
-	}
-
-	public int getErrorCode() {
-		return errorCode;
-	}
-
-	@Override
-	public String getLocalizedMessage() {
-		return super.getMessage();
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteException.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteException.java
deleted file mode 100755
index 5da16bb..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteException.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.exception;
-
-abstract public class RemoteException extends Exception
-{
-
-	public RemoteException() {
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-	public RemoteException(String message, Throwable cause) {
-		super(message, cause);
-		// TODO Auto-generated constructor stub
-	}
-
-	public RemoteException(String message) {
-		super(message);
-		// TODO Auto-generated constructor stub
-	}
-
-	public RemoteException(Throwable cause) {
-		super(cause);
-		// TODO Auto-generated constructor stub
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteExecutionException.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteExecutionException.java
deleted file mode 100755
index 3a52823..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteExecutionException.java
+++ /dev/null

@@ -1,80 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.exception;
-
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.remotetools.core.messages.Messages;
-
-
-public class RemoteExecutionException extends RemoteException {
-	private static final long serialVersionUID = 1L;
-
-	private String resultmessage;
-
-	private String errormessage;
-
-	private int exitCode;
-
-	public RemoteExecutionException(String string) {
-		super(string);
-	}
-
-	public RemoteExecutionException(String string, Exception e) {
-		super(string, e);
-	}
-
-	public RemoteExecutionException(Exception e) {
-		super(e);
-	}
-
-	public RemoteExecutionException(String message, int exitcode, String resultmessage, String errormessage) {
-		super(message);
-		if (resultmessage.length() == 0)
-			resultmessage = null;
-		if (errormessage.length() == 0)
-			errormessage = null;
-		this.resultmessage = resultmessage;
-		this.errormessage = errormessage;
-		this.exitCode = exitcode;
-	}
-
-	public String getResultMessage() {
-		return resultmessage;
-	}
-
-	public String getErrorMessage() {
-		if (errormessage == null) {
-			return Messages.RemoteExecutionException_0;
-		} else {
-			return errormessage;
-		}
-	}
-
-	public int getExitCode() {
-		return exitCode;
-	}
-
-	public String toString() {
-		if (exitCode != 0) {
-			String msg = NLS.bind(Messages.RemoteExecutionException_1, new Object[] {getMessage(), exitCode});
-			if (resultmessage != null) {
-				msg += "\n" + resultmessage; //$NON-NLS-1$
-			}
-			if (errormessage != null ) {
-				msg += "\n" + errormessage; //$NON-NLS-1$
-			}
-			return msg;
-		} else {
-			return super.toString();
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteOperationException.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteOperationException.java
deleted file mode 100755
index aa4dcfd..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/exception/RemoteOperationException.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.exception;
-
-/**
- * Describes remote operations errors. This do not include errors generated by a
- * user-generated remote command that failed.
- * 
- * @author Richard Maciel
- * 
- */
-public class RemoteOperationException extends RemoteException {
-	private static final long serialVersionUID = 1L;
-	
-	/**
-	 * 
-	 */
-	public RemoteOperationException() {
-		// TODO Auto-generated constructor stub
-	}
-	
-	/**
-	 * @param message
-	 */
-	public RemoteOperationException(String message) {
-		super(message);
-		// TODO Auto-generated constructor stub
-	}
-
-	/**
-	 * @param cause
-	 */
-	public RemoteOperationException(Throwable cause) {
-		super(cause);
-		// TODO Auto-generated constructor stub
-	}
-
-	/**
-	 * @param message
-	 * @param cause
-	 */
-	public RemoteOperationException(String message, Throwable cause) {
-		super(message, cause);
-		// TODO Auto-generated constructor stub
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/AbstractRemoteExecution.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/AbstractRemoteExecution.java
deleted file mode 100755
index 2ea834b..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/AbstractRemoteExecution.java
+++ /dev/null

@@ -1,107 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.common;
-
-import org.eclipse.ptp.remotetools.core.IRemoteOperation;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.internal.ssh.ExecutionManager;
-
-/**
- * @author Richard Maciel, Daniel Felix Ferber
- */
-public abstract class AbstractRemoteExecution implements IRemoteOperation {
-	/**
-	 * The execution manager that created the execution.
-	 */
-	private ExecutionManager executionManager;
-	/**
-	 * The execution was canceled by the manager.
-	 */
-	protected boolean cancelled;
-	/**
-	 * The execution finished by itself.
-	 */
-	protected boolean finished;
-
-	/**
-	 * Default constructor.
-	 * <p>
-	 * It is protected because only the RemoteExecutionManager can instantiate
-	 * it and pass itself as the parameters to the constructor.
-	 * 
-	 * @param remExecManager
-	 * @throws RemoteConnectionException
-	 */
-	public AbstractRemoteExecution(ExecutionManager executionManager)
-			throws RemoteConnectionException {
-		this.executionManager = executionManager;
-		this.cancelled = false;
-		this.finished = false;
-	}
-
-	public final synchronized void cancel() {
-		notifyCancel();
-	}
-
-	public void close() {
-	}
-
-	public ExecutionManager getExecutionManager() {
-		return executionManager;
-	}
-
-	protected synchronized void notifyCancel() {
-		/*
-		 * By default, no logic is implemented to cancel the execution. Only
-		 * sets the cancel flag. Notifies all waiting thread that the execution
-		 * was canceled.
-		 */
-		cancelled = true;
-		this.notifyAll();
-	}
-
-	protected synchronized void notifyFinish() {
-		/*
-		 * By default, no logic is implemented to finish the execution. Notifies
-		 * all waiting thread that the execution finished by itself.
-		 */
-		finished = true;
-		this.notifyAll();
-	}
-
-	public synchronized void waitForEndOfExecution()
-			throws RemoteConnectionException, CancelException {
-		/*
-		 * Block until the execution finishes or is canceled.
-		 */
-		while (!finished && !cancelled) {
-			try {
-				this.wait();
-			} catch (InterruptedException e) {
-				Thread.currentThread().interrupt(); // set current thread flag
-				// Ignore spurious interrupts
-			}
-		}
-		if (wasCanceled()) {
-			throw new CancelException();
-		}
-	}
-
-	public synchronized boolean wasCanceled() {
-		return cancelled;
-	}
-
-	public synchronized boolean wasFinished() {
-		return finished;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/Debug.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/Debug.java
deleted file mode 100755
index 8c89e5e..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/Debug.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.common;
-
-public class Debug {
-	public static void println(String s) {
-//		System.out.println(s);
-	}
-
-	public static void printErrorln(String s) {
-//		System.err.println(s);
-	}
-
-	public static void println2(String s) {
-//		System.out.println(s);
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/RemoteScript.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/RemoteScript.java
deleted file mode 100755
index acf0b17..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/RemoteScript.java
+++ /dev/null

@@ -1,199 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.common;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.ptp.remotetools.core.IRemoteScript;
-
-/**
- * Default implementation of <code>IRemoteScript</code>.
- * 
- * @author Richard Maciel <b>Review OK</b>
- */
-public class RemoteScript implements IRemoteScript {
-	private final List<String> environment = new ArrayList<String>();
-
-	private boolean willForwardX11;
-
-	private InputStream inputStream = null;
-	private OutputStream outputStream = null;
-	private OutputStream errorStream = null;
-
-	private String[] script;
-
-	private boolean fetchProcessErrorStream = false;
-	private boolean fetchProcessInputStream = false;
-	private boolean fetchProcessOutputStream = false;
-
-	private boolean allocateTerminal = false;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.IRemoteScript#addEnvironment(java.lang.String
-	 * )
-	 */
-	public void addEnvironment(String variable) {
-		environment.add(variable);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteScript#addEnvironment(java.lang
-	 * .String[])
-	 */
-	public void addEnvironment(String[] variables) {
-		environment.addAll(Arrays.asList(variables));
-	}
-
-	public boolean getAllocateTerminal() {
-		return allocateTerminal;
-	}
-
-	public OutputStream getErrorStream() {
-		return errorStream;
-	}
-
-	public boolean getFetchProcessErrorStream() {
-		return fetchProcessErrorStream;
-	}
-
-	public boolean getFetchProcessInputStream() {
-		return fetchProcessInputStream;
-	}
-
-	public boolean getFetchProcessOutputStream() {
-		return fetchProcessOutputStream;
-	}
-
-	public InputStream getInputStream() {
-		return inputStream;
-	}
-
-	public OutputStream getOutputStream() {
-		return outputStream;
-	}
-
-	public String getScriptString() {
-		if (script == null) {
-			return null;
-		}
-
-		StringBuffer sb = new StringBuffer();
-
-		for (String env : environment) {
-			sb.append("export \"" + env + "\"; "); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-		for (int i = 0; i < script.length; i++) {
-			sb.append(script[i] + "; "); //$NON-NLS-1$
-		}
-		return sb.toString();
-	}
-
-	public void setAllocateTerminal(boolean flag) {
-		this.allocateTerminal = flag;
-	}
-
-	public void setFetchProcessErrorStream(boolean flag) {
-		this.fetchProcessErrorStream = flag;
-		this.errorStream = null;
-	}
-
-	public void setFetchProcessInputStream(boolean flag) {
-		this.fetchProcessInputStream = flag;
-		this.inputStream = null;
-	}
-
-	public void setFetchProcessOutputStream(boolean flag) {
-		this.fetchProcessOutputStream = flag;
-		this.outputStream = null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.remotetools.IRemoteScript#setForwardX11(boolean)
-	 */
-	public void setForwardX11(boolean willForward) {
-		this.willForwardX11 = willForward;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteScript#setProcessErrorStream(
-	 * java.io.OutputStream)
-	 */
-	public void setProcessErrorStream(OutputStream output) {
-		errorStream = output;
-		fetchProcessErrorStream = false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.IRemoteScript#setProcessInputStream(java.
-	 * io.InputStream)
-	 */
-	public void setProcessInputStream(InputStream input) {
-		inputStream = input;
-		fetchProcessInputStream = false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.IRemoteScript#setProcessOutputStream(java
-	 * .io.OutputStream)
-	 */
-	public void setProcessOutputStream(OutputStream output) {
-		outputStream = output;
-		fetchProcessOutputStream = false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.IRemoteScript#setScript(java.lang.String)
-	 */
-	public void setScript(String script) {
-		this.script = new String[1];
-		this.script[0] = script;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.IRemoteScript#setScript(java.lang.String[])
-	 */
-	public void setScript(String[] script) {
-		this.script = script;
-	}
-
-	public boolean willForwardX11() {
-		return willForwardX11;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/RemoteTunnel.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/RemoteTunnel.java
deleted file mode 100755
index c378e65..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/common/RemoteTunnel.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.common;
-
-import org.eclipse.ptp.remotetools.core.IRemoteTunnel;
-
-/**
- * Default implementation of <code>IRemoteTunnel</code>
- * @author Daniel Felix Ferber
- *
- */
-public class RemoteTunnel implements IRemoteTunnel {
-	int localPort;
-	int portOnRemoteHost;
-	String addressOnRemoteHost;
-	
-	public RemoteTunnel(int localPort, int portOnRemoteHost, String addressOnRemoteHost) {
-		super();
-		this.localPort = localPort;
-		this.portOnRemoteHost = portOnRemoteHost;
-		this.addressOnRemoteHost = addressOnRemoteHost;
-	}
-	
-	public String getAddressOnRemoteHost() {
-		return addressOnRemoteHost;
-	}
-	public int getLocalPort() {
-		return localPort;
-	}
-	public int getPortOnRemoteHost() {
-		return portOnRemoteHost;
-	}
-	public boolean equals(Object obj) {
-		RemoteTunnel other = (RemoteTunnel) obj;
-		return (other.localPort == this.localPort)
-		&& (other.addressOnRemoteHost == this.addressOnRemoteHost) 
-		&& (other.portOnRemoteHost == this.portOnRemoteHost);
-	}
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/core/Connection.properties b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/core/Connection.properties
deleted file mode 100755
index ca95d19..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/core/Connection.properties
+++ /dev/null

@@ -1,20 +0,0 @@
-###############################################################################
-# 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
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-multipleConnection=true
-maxChannelsPerConnection=6
-initialDefaultSessionLoad = 3
-
-longDutyCycle = 1000
-fastDutyCycle = 100
-inactivityThreashold = 5
-
-defaultTimeout = 10000
-defaultPort = 22
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/core/ConnectionProperties.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/core/ConnectionProperties.java
deleted file mode 100755
index 8e58e6f..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/core/ConnectionProperties.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.core;
-
-import java.util.ResourceBundle;
-
-/**
- * @author laggarcia
- * @since 1.3.2
- */
-public class ConnectionProperties {
-
-	private static final String ATTR_BUNDLE_ID = "org.eclipse.ptp.remotetools.internal.core.Connection"; //$NON-NLS-1$
-	private static final String ATTR_MULTIPLE_CONNECTION_PROPERTY = "multipleConnection"; //$NON-NLS-1$
-	private static final String ATTR_MAX_CHANNELS_PER_CONNECTION_PROPERTY = "maxChannelsPerConnection"; //$NON-NLS-1$
-	private static final String ATTR_LONG_DUTY_CYCLE = "longDutyCycle"; //$NON-NLS-1$
-	private static final String ATTR_FAST_DUTY_CYCLE = "fastDutyCycle"; //$NON-NLS-1$
-	private static final String ATTR_INACTIVITY_THREASHOLD = "inactivityThreashold"; //$NON-NLS-1$
-	private static final String ATTR_DEFAULT_PORT = "defaultPort"; //$NON-NLS-1$
-	private static final String ATTR_DEFAULT_TIMEOUT = "defaultTimeout"; //$NON-NLS-1$
-	private static final String ATTR_INITIAL_DEFAULT_SESSION_LOAD = "initialDefaultSessionLoad"; //$NON-NLS-1$
-	
-	public static boolean multipleConnection;
-	public static int maxChannelsPerConnection;
-	public static int initialDefaultSessionLoad;
-	
-	public static int longDutyCycle = 1000;
-	public static int fastDutyCycle = 100;
-	public static int inactivityThreashold = 5;
-	
-	public static int defaultTimeout = 10000;
-	public static int defaultPort = 22;
-	
-	static {
-		// load message values from bundle file
-		ResourceBundle bundle = ResourceBundle.getBundle(ATTR_BUNDLE_ID);
-		multipleConnection = new Boolean(bundle
-				.getString(ATTR_MULTIPLE_CONNECTION_PROPERTY)).booleanValue();
-		maxChannelsPerConnection = new Integer(bundle
-				.getString(ATTR_MAX_CHANNELS_PER_CONNECTION_PROPERTY)).intValue();
-		initialDefaultSessionLoad = new Integer(bundle.getString(ATTR_INITIAL_DEFAULT_SESSION_LOAD)).intValue();
-		longDutyCycle = new Integer(bundle.getString(ATTR_LONG_DUTY_CYCLE)).intValue();
-		fastDutyCycle = new Integer(bundle.getString(ATTR_FAST_DUTY_CYCLE)).intValue();
-		inactivityThreashold = new Integer(bundle.getString(ATTR_INACTIVITY_THREASHOLD)).intValue();
-		defaultPort = new Integer(bundle.getString(ATTR_DEFAULT_PORT)).intValue();
-		defaultTimeout = new Integer(bundle.getString(ATTR_DEFAULT_TIMEOUT)).intValue();		
-	}
-
-	private ConnectionProperties() {
-		// cannot create new instance
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/CipherTypes.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/CipherTypes.java
deleted file mode 100755
index 46d4b94..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/CipherTypes.java
+++ /dev/null

@@ -1,121 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Available cipher types and associated information. 
- * To add another cipher type, it's necessary that two attributes of the String type are created: first one
- * returns the id of the cipher type and must have its name in the format CIPHER_<cipher attributes' name>. Second one
- * must return the return the cipher's name and must have its name in the format NAME_CIPHER_<cipher attributes' name>
- * 
- * @author Richard Maciel
- *
- */
-public class CipherTypes {
-//	Available JSch cipher types: blowfish-cbc, 3des-cbc, aes128-cbc,aes192-cbc,aes256-cbc
-	public static final String CIPHER_BLOWFISH = CipherTypesMessages.getString("KEY_BLOWFISH"); //$NON-NLS-1$
-	public static final String CIPHER_3DES = CipherTypesMessages.getString("KEY_3DES"); //$NON-NLS-1$
-	public static final String CIPHER_AES128 = CipherTypesMessages.getString("KEY_AES128"); //$NON-NLS-1$
-	public static final String CIPHER_AES192 = CipherTypesMessages.getString("KEY_AES192"); //$NON-NLS-1$
-	public static final String CIPHER_AES256 = CipherTypesMessages.getString("KEY_AES256"); //$NON-NLS-1$
-//	 Use the default JSch cipher
-	public static final String CIPHER_DEFAULT = CipherTypesMessages.getString("KEY_DEFAULT"); //$NON-NLS-1$
-	
-	public static final String NAME_CIPHER_BLOWFISH = CipherTypesMessages.getString("NAME_BLOWFISH"); //$NON-NLS-1$
-	public static final String NAME_CIPHER_3DES = CipherTypesMessages.getString("NAME_3DES"); //$NON-NLS-1$
-	public static final String NAME_CIPHER_AES128 = CipherTypesMessages.getString("NAME_AES128"); //$NON-NLS-1$
-	public static final String NAME_CIPHER_AES192 = CipherTypesMessages.getString("NAME_AES192"); //$NON-NLS-1$
-	public static final String NAME_CIPHER_AES256 = CipherTypesMessages.getString("NAME_AES256"); //$NON-NLS-1$
-	public static final String NAME_CIPHER_DEFAULT = CipherTypesMessages.getString("NAME_DEFAULT"); // Use the default JSch cipher //$NON-NLS-1$
-	
-	
-	private static Map cipherTypesMap = null;
-	
-	/**
-	 * Creates a map containing tuples CipherTypeId and CipherTypeName
-	 * from the declared attributes.
-	 * @return Map created
-	 */
-	private static Map createCipherTypesMap() {
-		Field [] fields = CipherTypes.class.getDeclaredFields();
-		List fieldList = new ArrayList(Arrays.asList(fields));
-		
-		Map cipherMap = new HashMap();
-		
-//		 Get the tuples of attributes from the fieldList and put them in the cipherMap
-		for(Iterator it = fieldList.iterator(); it.hasNext(); ) {
-//			 Look for a attribute whose prefix is CIPHER and fetch its value
-			Field f = (Field)it.next();
-			if(f.getName().startsWith("CIPHER_")) { //$NON-NLS-1$
-				Field ciphField = f;
-				// Found one. Now concat the NAME_ prefix into the choosen name string and
-				// look for an attribute with that name.
-				try {
-					Field nameCiphField = (Field)CipherTypes.class.getField("NAME_" + ciphField.getName()); //$NON-NLS-1$
-					try {
-						// Add field values to map.
-						cipherMap.put(ciphField.get(null), nameCiphField.get(null));
-					} catch (IllegalArgumentException e) {
-						// Will not occur, since we use null as argument
-						e.printStackTrace();
-						throw new RuntimeException(e);
-					} catch (IllegalAccessException e) {
-						// Will not occur since outside try already treat this case.
-						e.printStackTrace();
-						throw new RuntimeException(e);
-					}
-				} catch (SecurityException e) {
-					// Ignore protected and private fields
-				} catch (NoSuchFieldException e) {
-					// No equivalent name field. Throw a RuntimeException
-					e.printStackTrace();
-					//"Did not find " + "NAME_" + ciphField.getName() + " to match"
-					throw new RuntimeException(
-							NLS.bind(CipherTypesMessages.getString("CipherTypes.AttributeNameExceptionMsg2"),  //$NON-NLS-1$
-									 ciphField.getName())); //$NON-NLS-1$
-				}
-				
-			}
-		}
-		
-		return cipherMap;
-	}
-	
-	/**
-	 * Get the map containing tuples CipherTypeId and CipherTypeName
-	 *  
-	 * @return Map
-	 */
-	static public Map getCipherTypesMap() {
-		// Return the value of the singleton
-		if(cipherTypesMap == null)
-			cipherTypesMap = createCipherTypesMap();
-		
-		return cipherTypesMap;
-	}
-	
-	/**
-	 * Class should not be created.
-	 */
-	protected CipherTypes() {
-	}
-}	

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/CipherTypesMessages.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/CipherTypesMessages.java
deleted file mode 100755
index 91661b7..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/CipherTypesMessages.java
+++ /dev/null

@@ -1,33 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class CipherTypesMessages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remotetools.internal.ssh.ciphertypesmessages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(BUNDLE_NAME);
-
-	private CipherTypesMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/Connection.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/Connection.java
deleted file mode 100755
index e6116cf..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/Connection.java
+++ /dev/null

@@ -1,959 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 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 Implementation
- *     Roland Schulz, University of Tennessee
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Set;
-import java.util.concurrent.ArrayBlockingQueue;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.jsch.core.IJSchService;
-import org.eclipse.ptp.remotetools.RemotetoolsPlugin;
-import org.eclipse.ptp.remotetools.core.AuthToken;
-import org.eclipse.ptp.remotetools.core.IRemoteConnection;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.core.IRemoteOperation;
-import org.eclipse.ptp.remotetools.core.KeyAuthToken;
-import org.eclipse.ptp.remotetools.core.PasswdAuthToken;
-import org.eclipse.ptp.remotetools.core.messages.Messages;
-import org.eclipse.ptp.remotetools.exception.LocalPortBoundException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.internal.common.RemoteTunnel;
-import org.eclipse.ptp.remotetools.internal.core.ConnectionProperties;
-
-import com.jcraft.jsch.Channel;
-import com.jcraft.jsch.ChannelExec;
-import com.jcraft.jsch.ChannelSftp;
-import com.jcraft.jsch.JSchException;
-import com.jcraft.jsch.Proxy;
-import com.jcraft.jsch.Session;
-import com.jcraft.jsch.SocketFactory;
-import com.jcraft.jsch.UIKeyboardInteractive;
-import com.jcraft.jsch.UserInfo;
-
-/**
- * The connection to a remote host. Manages a pool of connection used to open
- * execution channels, since some SSH server showed to impose a limit of
- * execution channels per connection.
- * 
- * @author Richard Maciel and Daniel Felix Ferber.
- */
-public class Connection implements IRemoteConnection {
-	private class ConnectionSlot {
-		Session session = null;
-		int numberUsedChannels = 0;
-
-		ConnectionSlot(Session session) {
-			this.session = session;
-		}
-
-		ConnectionSlot(Session session, int initialLoad) {
-			this.session = session;
-			this.numberUsedChannels = initialLoad;
-		}
-	}
-
-/**
-	 * This class is required by the JSch library.
-	 * 
-	 * JSch will call {@link #promptKeyboardInteractive} until the password is
-	 * correct or it times out. We only allow it to try once, then return null
-	 * in order to speed up the timeout.
-	 * 
-	 * TODO: this should prompt the user for a password if {@link
-	 * @promptKeyboardInteractive} is called twice, since their password is
-	 * wrong for some reason.
-	 * 
-	 * @author Richard Maciel
-	 * 
-	 */
-	private class SSHUserInfo implements UserInfo, UIKeyboardInteractive {
-		private String password;
-		private String passphrase;
-		private boolean isPasswdBased;
-		private boolean firstTry = true;
-
-		private SSHUserInfo() {
-		}
-
-		public String getPassphrase() {
-			return passphrase;
-		}
-
-		public String getPassword() {
-			if (firstTry) {
-				firstTry = false;
-				return password;
-			}
-			return null;
-		}
-
-		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 || password == null) {
-				return null;
-			}
-			String[] response = new String[1];
-			response[0] = password;
-			if (firstTry) {
-				firstTry = false;
-				return response;
-			}
-			return null;
-		}
-
-		public boolean promptPassphrase(String message) {
-			return !isPasswdBased;
-		}
-
-		public boolean promptPassword(String message) {
-			return isPasswdBased;
-		}
-
-		public boolean promptYesNo(String str) {
-			// Always accept host identity
-			return true;
-		}
-
-		public void reset() {
-			firstTry = true;
-		}
-
-		public void setPassphrase(String passphrase) {
-			this.passphrase = passphrase;
-		}
-
-		public void setPassword(String password) {
-			this.password = password;
-		}
-
-		public void setUsePassword(boolean usePassword) {
-			this.isPasswdBased = usePassword;
-		}
-
-		public void showMessage(String message) {
-		}
-	}
-
-	/**
-	 * By default the Jsch connect method ignores the timeout argument which
-	 * prevents any way of interrupting the connection (e.g. with a progress
-	 * monitor). We use a proxy so that we can connect to a remote host with a
-	 * timeout.
-	 */
-	private class SSHProxy implements Proxy {
-		private Socket fSocket;
-		private final IProgressMonitor fMonitor;
-
-		public SSHProxy(IProgressMonitor monitor) {
-			fMonitor = monitor;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see com.jcraft.jsch.Proxy#connect(com.jcraft.jsch.SocketFactory,
-		 * java.lang.String, int, int)
-		 */
-		public void connect(SocketFactory socket_factory, final String host, final int port, int timeout) throws Exception {
-			final Exception[] ex = new Exception[1];
-			Thread connThread = new Thread(new Runnable() {
-				public void run() {
-					fSocket = null;
-					try {
-						fSocket = new Socket(host, port);
-					} catch (Exception e) {
-						ex[0] = e;
-						if (fSocket != null && fSocket.isConnected()) {
-							try {
-								fSocket.close();
-							} catch (Exception ee) {
-							}
-						}
-						fSocket = null;
-					}
-				}
-			});
-			connThread.setName("Connecting to " + host); //$NON-NLS-1$
-			connThread.start();
-
-			/*
-			 * Loop checking if the thread has completed. Check if the progress
-			 * monitor is cancelled every 1000 ms. If timeout is 0, we should
-			 * loop forever (or until the progress monitor is cancelled)
-			 */
-			try {
-				int tryTimeout = timeout > 1000 ? 1000 : timeout;
-				while (connThread.isAlive() && timeout >= 0 && !fMonitor.isCanceled()) {
-					connThread.join(1000);
-					timeout -= tryTimeout;
-				}
-			} catch (InterruptedException e) {
-			}
-
-			if (fMonitor.isCanceled() || timeout < 0) {
-				connThread.interrupt();
-				connThread = null;
-			}
-
-			if (fMonitor.isCanceled()) {
-				throw new JSchException(Messages.Connection_Operation_cancelled_by_user);
-			}
-
-			if (timeout < 0) {
-				throw new JSchException(Messages.Connection_Timeout);
-			}
-
-			if (fSocket == null) {
-				throw new JSchException(ex[0].getMessage());
-			}
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see com.jcraft.jsch.Proxy#getInputStream()
-		 */
-		public InputStream getInputStream() {
-			try {
-				if (fSocket != null) {
-					return fSocket.getInputStream();
-				}
-			} catch (IOException e) {
-			}
-			return null;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see com.jcraft.jsch.Proxy#getOutputStream()
-		 */
-		public OutputStream getOutputStream() {
-			try {
-				if (fSocket != null) {
-					return fSocket.getOutputStream();
-				}
-			} catch (IOException e) {
-			}
-			return null;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see com.jcraft.jsch.Proxy#getSocket()
-		 */
-		public Socket getSocket() {
-			return fSocket;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see com.jcraft.jsch.Proxy#close()
-		 */
-		public void close() {
-			try {
-				if (fSocket != null) {
-					fSocket.close();
-				}
-			} catch (IOException e) {
-				// do nothing
-			}
-		}
-	}
-
-	/**
-	 * Data structure to access the ssh library.
-	 */
-	private final IJSchService jsch = RemotetoolsPlugin.getDefault().getJSchService();
-	/**
-	 * A connection to the remote host. The default connections is always
-	 * created, but more connections may be added to the pool on demand.
-	 */
-	private Session defaultSession;
-	private String fUsername;
-	private String fHostname;
-	private int fPort;
-	private int fTimeout;
-	private String fCipherType;
-
-	private final SSHUserInfo sshuserinfo = new SSHUserInfo();
-
-	/**
-	 * The execution managers created for this connection.
-	 */
-	private IRemoteExecutionManager executionManager = null;
-	/**
-	 * Tunnels to remote host.
-	 */
-	private final Set<RemoteTunnel> tunnels = new HashSet<RemoteTunnel>();
-
-	/**
-	 * sftp channel pool shared by all executions managers and file tools.
-	 */
-	private static final int SFTP_POOLSIZE = 3;
-
-	private final ArrayBlockingQueue<ChannelSftp> sftpChannelPool = new ArrayBlockingQueue<ChannelSftp>(SFTP_POOLSIZE);
-
-	/**
-	 * Hashtable that keeps all remote executions that can be killed. The table
-	 * is indexed by Internal PID.
-	 */
-	private final Hashtable<Integer, KillableExecution> activeProcessTable = new Hashtable<Integer, KillableExecution>();
-	/**
-	 * The internal identification number for the next remote execution.
-	 */
-	private int nextInternalPID;
-
-	/**
-	 * The control connection.
-	 */
-	private ControlChannel controlChannel;
-
-	/**
-	 * A job that watches for finished executions.
-	 */
-	private ExecutionObserver executionObserver;
-
-	/**
-	 * Array of all connections and how many pty channels were used.
-	 */
-	private final ArrayList<ConnectionSlot> connectionPool = new ArrayList<ConnectionSlot>();
-
-	/**
-	 * Maps a channel to the connection where it was created.
-	 */
-	private final HashMap<Channel, ConnectionSlot> channelToConnectioPool = new HashMap<Channel, ConnectionSlot>();
-
-	/**
-	 * Locks used on synchronized operations.
-	 */
-	protected ConnectionLocks connectionLocks;
-
-	private RemotePortForwardingPool forwardingPool;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteConnection#connect(org.eclipse
-	 * .ptp.remotetools.core.AuthToken, java.lang.String, int, java.lang.String,
-	 * int, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public synchronized void connect(AuthToken authToken, String hostname, int port, String cipherType, int timeout,
-			IProgressMonitor monitor) throws RemoteConnectionException {
-		SubMonitor progress = SubMonitor.convert(monitor, 100);
-
-		try {
-			this.nextInternalPID = 0;
-
-			fUsername = authToken.getUsername();
-
-			// Convert information for the UserInfo class used by JSch
-			if (authToken instanceof PasswdAuthToken) {
-				sshuserinfo.setUsePassword(true);
-				sshuserinfo.setPassword(((PasswdAuthToken) authToken).getPassword());
-			} else if (authToken instanceof KeyAuthToken) {
-				KeyAuthToken token = (KeyAuthToken) authToken;
-				sshuserinfo.setUsePassword(false);
-				sshuserinfo.setPassphrase(token.getPassphrase());
-				try {
-					jsch.getJSch().addIdentity(token.getKeyPath().getAbsolutePath());
-				} catch (JSchException e) {
-					throw new RemoteConnectionException(e.getMessage());
-				}
-			} else {
-				throw new RuntimeException(Messages.Connection_AuthenticationTypeNotSupported);
-			}
-
-			fHostname = hostname;
-
-			fPort = port;
-			if (fPort == 0) {
-				fPort = ConnectionProperties.defaultPort;
-			}
-
-			fCipherType = cipherType;
-			if (fCipherType == null) {
-				fCipherType = CipherTypes.CIPHER_DEFAULT;
-			}
-
-			fTimeout = timeout;
-			if (fTimeout == 0) {
-				fTimeout = ConnectionProperties.defaultTimeout;
-			}
-
-			/*
-			 * Create session.
-			 */
-			try {
-				defaultSession = jsch.createSession(fHostname, fPort, fUsername);
-				sshuserinfo.reset();
-				defaultSession.setUserInfo(sshuserinfo);
-				defaultSession.setServerAliveInterval(300000);
-				defaultSession.setServerAliveCountMax(6);
-				defaultSession.setProxy(new SSHProxy(progress));
-			} catch (JSchException e) {
-				disconnect();
-				throw new RemoteConnectionException(e.getMessage());
-			}
-
-			setSessionCipherType(defaultSession);
-
-			try {
-				defaultSession.connect(fTimeout);
-			} catch (JSchException e) {
-				disconnect();
-				throw new RemoteConnectionException(e.getMessage());
-			}
-
-			/*
-			 * Create control execution channel.
-			 */
-			if (controlChannel == null) {
-				controlChannel = new ControlChannel(this);
-			}
-			try {
-				controlChannel.open(progress.newChild(10));
-			} catch (RemoteConnectionException e) {
-				disconnect();
-				throw new RemoteConnectionException(e.getMessage());
-			}
-
-			/*
-			 * Create sft pool.
-			 */
-			try {
-				for (int i = 0; i < SFTP_POOLSIZE; i++) {
-					ChannelSftp sftp = (ChannelSftp) defaultSession.openChannel("sftp"); //$NON-NLS-1$
-					sftp.connect();
-					boolean bInterrupted = Thread.interrupted();
-					while (sftp != null) {
-						try {
-							sftpChannelPool.put(sftp);
-							sftp = null;
-						} catch (InterruptedException e) {
-							// System.out.println("Connection.connect: InterruptedException ignored");
-							bInterrupted = true;
-						}
-					}
-					if (bInterrupted)
-						Thread.currentThread().interrupt(); // set interrupt
-															// state
-				}
-			} catch (JSchException e) {
-				throw new RemoteConnectionException(Messages.Connection_2 + e.getMessage());
-			}
-
-			/*
-			 * The default session cannot be fully used for connection pool,
-			 * since some channels are already using pty.
-			 */
-			ConnectionSlot slot = new ConnectionSlot(defaultSession, ConnectionProperties.initialDefaultSessionLoad);
-			connectionPool.add(slot);
-
-			if (forwardingPool == null) {
-				forwardingPool = new RemotePortForwardingPool(this);
-			}
-
-			/*
-			 * Reset cancel flag
-			 */
-			if (executionManager != null) {
-				executionManager.resetCancel();
-			}
-
-			/*
-			 * Create observer thread and start it
-			 */
-			executionObserver = new ExecutionObserver(this);
-			executionObserver.start();
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.IRemoteConnection#getRemoteExecutionManager()
-	 */
-	public synchronized IRemoteExecutionManager createRemoteExecutionManager() throws RemoteConnectionException {
-		if (executionManager == null) {
-			executionManager = new ExecutionManager(this);
-		}
-		return executionManager;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.remotetools.IRemoteConnection#disconnect()
-	 */
-	public synchronized void disconnect() {
-		/*
-		 * First, cancel all ongoing executions and tunnels created by managers,
-		 * by closing the execution manager.
-		 */
-		if (executionManager != null) {
-			executionManager.close();
-		}
-
-		if (executionObserver != null) {
-			executionObserver.cancel();
-		}
-
-		/*
-		 * Then, close channels created by the connection.
-		 */
-		if (controlChannel != null) {
-			controlChannel.close();
-		}
-
-		boolean bInterrupted = Thread.interrupted();
-		while (!sftpChannelPool.isEmpty()) {
-			try {
-				sftpChannelPool.take().disconnect();
-			} catch (InterruptedException e) {
-				bInterrupted = true;
-			}
-		}
-		sftpChannelPool.clear();
-		if (bInterrupted) {
-			Thread.currentThread().interrupt(); // set interrupt state
-		}
-
-		/*
-		 * Close all connections from the pool.
-		 */
-		for (ConnectionSlot slot : connectionPool) {
-			slot.session.disconnect();
-		}
-		connectionPool.clear();
-
-		/*
-		 * Reset internal state variables.
-		 */
-		defaultSession = null;
-
-		if (forwardingPool != null) {
-			forwardingPool.disconnect();
-		}
-	}
-
-	public String getHostname() {
-		return fHostname;
-	}
-
-	public int getPort() {
-		return fPort;
-	}
-
-	public Session getSession() {
-		return defaultSession;
-	}
-
-	/*
-	 * public String getPassword() { return password; }
-	 */
-
-	/**
-	 * Gets the SFTP channel that may be used by the internal implementation to
-	 * do file system operations on the remote host. Gets a new channel if the
-	 * default has been closed for some reason.
-	 * 
-	 * @return default channel
-	 * @throws RemoteConnectionException
-	 */
-	public ChannelSftp getSFTPChannel() throws RemoteConnectionException {
-
-		// System.out.println("channelPool.size() -> " +
-		// sftpChannelPool.size());
-		// System.out.println("thread: "+Thread.currentThread().getName());
-		try {
-			// if (sftpChannelPool.size() == 0)
-			// System.err.println("SFTPChannelPool currently empty. Thread will have to wait till other thread releases a channel.");
-			ChannelSftp channel = null;
-			boolean bInterrupted = Thread.interrupted();
-			while (channel == null) {
-				try {
-					channel = sftpChannelPool.take();
-				} catch (InterruptedException e) {
-					// System.out.println("getSFTPChannel: InterruptedException ignored");
-					bInterrupted = true;
-				}
-			}
-			if (bInterrupted) {
-				Thread.currentThread().interrupt(); // set interrupt state
-			}
-			// System.out.println("channel: "+channel.isConnected()+","+channel.isEOF());
-			if (!channel.isConnected()) {
-				channel = (ChannelSftp) defaultSession.openChannel("sftp"); //$NON-NLS-1$
-				channel.connect();
-			}
-			return channel;
-		} catch (JSchException e) {
-			throw new RemoteConnectionException(Messages.Connection_Connect_FailedCreateSFTPConnection, e);
-		}
-	}
-
-	public int getTimeout() {
-		return fTimeout;
-	}
-
-	public String getUsername() {
-		return fUsername;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.remotetools.IRemoteConnection#isConnected()
-	 */
-	public synchronized boolean isConnected() {
-		if (defaultSession == null) {
-			return false;
-		}
-
-		try {
-			test();
-		} catch (RemoteConnectionException e) {
-			return false;
-		}
-
-		return defaultSession.isConnected();
-	}
-
-	/**
-	 * Releases the SFTP channel
-	 * 
-	 * @param channel
-	 *            channel to release
-	 */
-	public void releaseSFTPChannel(ChannelSftp channel) {
-		// System.out.println("release, channelPool.size() -> " +
-		// sftpChannelPool.size());
-		// System.out.println("thread: "+Thread.currentThread().getName());
-
-		boolean bInterrupted = Thread.interrupted();
-		while (channel != null) {
-			try {
-				sftpChannelPool.put(channel);
-				channel = null; // Successful returned
-			} catch (InterruptedException e) {
-				// System.out.println("releaseSFTPChannel: InterruptedException ignored");
-				bInterrupted = true;
-			}
-		}
-		if (bInterrupted) {
-			Thread.currentThread().interrupt(); // set interrupt state
-		}
-	}
-
-	/**
-	 * Open a new connection to the remote host and add this connection to the
-	 * pool.
-	 * 
-	 * @return A pool entry.
-	 * @throws RemoteConnectionException
-	 */
-	private ConnectionSlot createConnectionSlot() throws RemoteConnectionException {
-
-		/*
-		 * Create a Jsch session, with the same authentication values as the
-		 * default session.
-		 */
-		Session newSession = null;
-		try {
-			newSession = jsch.createSession(fHostname, fPort, fUsername);
-			sshuserinfo.reset();
-			newSession.setUserInfo(sshuserinfo);
-			newSession.setServerAliveInterval(300000);
-			newSession.setServerAliveCountMax(6);
-			setSessionCipherType(newSession);
-		} catch (JSchException e) {
-			throw new RemoteConnectionException(Messages.Connection_CreateConnectionSlot_FailedCreateNewSession, e);
-		}
-
-		/*
-		 * Connect to remote host.
-		 */
-		try {
-			newSession.connect(fTimeout);
-		} catch (JSchException e) {
-			throw new RemoteConnectionException(Messages.Connection_CreateConnectionSlot_FailedConnectNewSession, e);
-		}
-
-		/*
-		 * Create slot and add to the pool.
-		 */
-		ConnectionSlot slot = new ConnectionSlot(newSession);
-		connectionPool.add(slot);
-		return slot;
-	}
-
-	/**
-	 * Select a cipher for the session based on the cipherType attribute
-	 * 
-	 * @param session
-	 *            Session that will have its cipher altered.
-	 */
-	private void setSessionCipherType(Session session) {
-		/*
-		 * If the user selected a cipher other than the default, setup the
-		 * cipher
-		 */
-		// TODO: Let the user select a list of ciphers, instead of only one
-		if (!fCipherType.equals(CipherTypes.CIPHER_DEFAULT)) {
-
-			// Verify if the cipher is supported. Throw an exception if it isnt.
-			if (!CipherTypes.getCipherTypesMap().containsKey(fCipherType)) {
-				// TODO: Throw a real exception, not a runtime one
-				throw new RuntimeException(Messages.Connection_SetCipherType_CipherNotSupported);
-			}
-
-			// Set the session's cipher
-			Hashtable<String, String> config = new Hashtable<String, String>();
-			config.put("cipher.s2c", fCipherType); //$NON-NLS-1$
-			config.put("cipher.c2s", fCipherType); //$NON-NLS-1$
-
-			session.setConfig(config);
-		}
-	}
-
-	/**
-	 * Creates a new execution channel. The channel may or may not be managed by
-	 * the connection pool. All execution channels that require PTY must be
-	 * managed by the pool, except really special cases, like the control
-	 * channel and default SFTP channel. Channels without PTY may be managed, by
-	 * it is recommended no to be. This will allocate them into the default
-	 * session, since an unlimited number of not PTY channels can be allocated
-	 * into the default session.
-	 * 
-	 * @param isInConnectionPool
-	 *            As described.
-	 * @return The requested execution channel.
-	 * @throws RemoteConnectionException
-	 *             If the allocation of new channel failed of if it was not
-	 *             possible to create a new ssh session for the new channel.
-	 */
-	protected ChannelExec createExecChannel(boolean isInConnectionPool) throws RemoteConnectionException {
-		if (isInConnectionPool) {
-			/*
-			 * Search for the first available connection slot or create a new
-			 * one if all are full.
-			 */
-			ConnectionSlot suggestedSlot = null;
-			for (ConnectionSlot slot : connectionPool) {
-				if (slot.numberUsedChannels < ConnectionProperties.maxChannelsPerConnection) {
-					suggestedSlot = slot;
-					break;
-				}
-			}
-			if (suggestedSlot == null) {
-				suggestedSlot = createConnectionSlot();
-			}
-			/*
-			 * Create the channel and update the pool.
-			 */
-			ChannelExec channel;
-			try {
-				channel = (ChannelExec) suggestedSlot.session.openChannel("exec"); //$NON-NLS-1$
-			} catch (JSchException e) {
-				throw new RemoteConnectionException(Messages.Connection_CreateExecChannel_FailedCreateNewExecChannel, e);
-			}
-			suggestedSlot.numberUsedChannels++;
-			channelToConnectioPool.put(channel, suggestedSlot);
-			return channel;
-		} else {
-			/*
-			 * Create a channel on the default channel.
-			 */
-			try {
-				return (ChannelExec) defaultSession.openChannel("exec"); //$NON-NLS-1$
-			} catch (JSchException e) {
-				throw new RemoteConnectionException(Messages.Connection_CreateExecChannel_FailedCreateNewExecChannel, e);
-			}
-		}
-	}
-
-	protected synchronized int createNextPIID() {
-		return ++nextInternalPID % Integer.MAX_VALUE;
-	}
-
-	/**
-	 * Create a forwarding from a remote port to a local port.
-	 * 
-	 * @param localPort
-	 * @param addressOnRemoteHost
-	 * @param portOnRemoteHost
-	 * @return
-	 * @throws RemoteConnectionException
-	 */
-	protected RemoteTunnel createTunnel(int localPort, String addressOnRemoteHost, int portOnRemoteHost)
-			throws RemoteConnectionException, LocalPortBoundException {
-		RemoteTunnel tunnel = new RemoteTunnel(localPort, portOnRemoteHost, addressOnRemoteHost);
-		if (tunnels.contains(tunnel)) {
-			throw new LocalPortBoundException(Messages.Connection_CreateTunnel_TunnelPortAlreadyAlloced);
-		}
-
-		try {
-			defaultSession.setPortForwardingL(tunnel.getLocalPort(), tunnel.getAddressOnRemoteHost(), tunnel.getPortOnRemoteHost());
-		} catch (JSchException e) {
-			if (e.getMessage().matches("PortForwardingL: local port .* is already registered.")) { //$NON-NLS-1$
-				// Selected local port is already bound.
-				throw new LocalPortBoundException(Messages.Connection_CreateTunnel_TunnelPortAlreadyAlloced);
-			}
-			throw new RemoteConnectionException(Messages.Connection_CreateTunnel_FailedCreateTunnel, e);
-		}
-
-		tunnels.add(tunnel);
-		return tunnel;
-	}
-
-	protected Hashtable<Integer, KillableExecution> getActiveProcessTable() {
-		return activeProcessTable;
-	}
-
-	protected RemotePortForwardingPool getForwardingPool() {
-		return forwardingPool;
-	}
-
-	protected String getKillablePrefix(KillableExecution execution) {
-		return controlChannel.getKillablePrefix(execution.getInternaID());
-	}
-
-	/**
-	 * Sends a KILL signal to the remote killable execution.
-	 * 
-	 * @param execution
-	 */
-	protected void killExecution(KillableExecution execution) {
-		controlChannel.killRemoteProcess(execution.getPID());
-	}
-
-	protected void registerObservedExecution(IRemoteOperation operation) {
-		if (operation instanceof KillableExecution) {
-			KillableExecution killableExecution = (KillableExecution) operation;
-			synchronized (getActiveProcessTable()) {
-				getActiveProcessTable().put(new Integer(killableExecution.getInternaID()), killableExecution);
-			}
-		}
-	}
-
-	/**
-	 * Remove a channel from the pool, leaving the slot available for another
-	 * channel.
-	 * 
-	 * @param channel
-	 */
-	protected void releaseChannel(Channel channel) {
-		/*
-		 * The channel may or may not be in the connection pool, depending how
-		 * it was created. Ant any case, always disconnect the channel.
-		 */
-		channel.disconnect();
-		ConnectionSlot slot = channelToConnectioPool.remove(channel);
-		if (slot != null) {
-			slot.numberUsedChannels--;
-		}
-	}
-
-	/**
-	 * Release the forwarding of the remote port.
-	 * 
-	 * @param tunnel
-	 * @throws RemoteConnectionException
-	 */
-	protected void releaseTunnel(RemoteTunnel tunnel) throws RemoteConnectionException {
-		if (!tunnels.contains(tunnel)) {
-			throw new RemoteConnectionException(Messages.Connection_ReleaseTunnel_PortNotAllocedForTunnel);
-		}
-
-		try {
-			RemoteTunnel remoteTunnel = tunnel;
-			defaultSession.delPortForwardingL(remoteTunnel.getLocalPort());
-		} catch (JSchException e) {
-			throw new RemoteConnectionException(Messages.Connection_ReleaseTunnel_FailedRemoveTunnel, e);
-		}
-
-		tunnels.remove(tunnel);
-	}
-
-	protected void setPID(int piid, int pid) {
-		// Look for the object which key is PIID.
-		synchronized (getActiveProcessTable()) {
-			KillableExecution exec = getActiveProcessTable().get(new Integer(piid));
-			if (exec != null) {
-				// Process could be already finished and removed fro mthe table.
-				exec.setPID(pid);
-			}
-		}
-	}
-
-	/**
-	 * Performs a sanity test to make sure that the connection is alive and has
-	 * a valid state.
-	 * <p>
-	 * The connection may get dropped due some external interference, like
-	 * loosing physical access to the remote machine. Or the connection may drop
-	 * some channel, as it may be caused by a misbehavior of the remote SSH
-	 * server or by a bug in the local SSH implementation.
-	 * <p>
-	 * If some problem is detected, then an {@link RemoteConnectionException} is
-	 * thrown. Else, the method returns.
-	 * 
-	 * @throws RemoteConnectionException
-	 *             The connection was entirely dropped or some channel got lost.
-	 */
-	protected synchronized void test() throws RemoteConnectionException {
-		/*
-		 * Check all SSH sessions
-		 */
-		for (ConnectionSlot slot : connectionPool) {
-			if (!slot.session.isConnected()) {
-				throw new RemoteConnectionException(Messages.Connection_0);
-			}
-		}
-
-		/*
-		 * Check control channel.
-		 */
-		if (controlChannel == null || !controlChannel.isConnected()) {
-			throw new RemoteConnectionException(Messages.Connection_1);
-		}
-
-	}
-
-	protected void unregisterObservedExecution(IRemoteOperation operation) {
-		if (operation instanceof KillableExecution) {
-			KillableExecution killableExecution = (KillableExecution) operation;
-			synchronized (getActiveProcessTable()) {
-				getActiveProcessTable().remove(new Integer(killableExecution.getInternaID()));
-			}
-		}
-	}
-}
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ConnectionLocks.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ConnectionLocks.java
deleted file mode 100644
index 7d6f00d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ConnectionLocks.java
+++ /dev/null

@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 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
- *     Roland Schulz, University of Tennessee
- *******************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.util.concurrent.locks.ReentrantLock;
-
-public class ConnectionLocks {
-	protected ReentrantLock remotePortForwarding = new ReentrantLock();
-	protected ReentrantLock localPortForwarding = new ReentrantLock();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ControlChannel.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ControlChannel.java
deleted file mode 100755
index 814bd17..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ControlChannel.java
+++ /dev/null

@@ -1,181 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ptp.remotetools.core.messages.Messages;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.internal.common.Debug;
-import org.eclipse.ptp.remotetools.utils.stream.ILineStreamListener;
-import org.eclipse.ptp.remotetools.utils.stream.TextStreamObserver;
-
-import com.jcraft.jsch.ChannelExec;
-import com.jcraft.jsch.JSchException;
-
-public class ControlChannel implements ILineStreamListener {
-	/*
-	 * Patterns recognized by the observer.
-	 */
-	private final static String markerPID = "PID="; //$NON-NLS-1$
-	private final static String markerPIID = "PIID="; //$NON-NLS-1$
-	private final static String markerSSH = "SSH_TTY="; //$NON-NLS-1$
-	private final Pattern pidPattern = Pattern.compile(markerPID + "(\\p{Digit}+) " + markerPIID + "(\\p{Digit}+)"); //$NON-NLS-1$ //$NON-NLS-2$
-	private final Pattern terminalPathPattern = Pattern.compile(markerSSH + "(/.+)"); //$NON-NLS-1$
-
-	// OutputStream that sends input to remote process input stream.
-	private OutputStream outputToControlTerminalInput;
-	private InputStream inputFromControlTerminalOutput;
-
-	// Control channel
-	private ChannelExec shell;
-
-	// Control terminal path.
-	private String controlTerminalPath;
-
-	// Control terminal observer thread.
-	private TextStreamObserver controlTerminalObserver;
-
-	/**
-	 * Parent execution manager who will be notified about events from the
-	 * control channel.
-	 */
-	private final Connection connection;
-
-	public ControlChannel(Connection connection) {
-		this.connection = connection;
-	}
-
-	public void open(IProgressMonitor monitor) throws RemoteConnectionException {
-		try {
-			// Open exec channel and alloc terminal
-			shell = connection.createExecChannel(false);
-			shell.setPty(true);
-			shell.setCommand("/bin/sh"); //$NON-NLS-1$
-			inputFromControlTerminalOutput = shell.getInputStream();
-			outputToControlTerminalInput = shell.getOutputStream();
-			shell.connect();
-		} catch (JSchException e) {
-			close();
-			throw new RemoteConnectionException(Messages.ControlChannel_Open_FailedCreateAuxiliaryShell, e);
-		} catch (IOException e) {
-			close();
-			throw new RemoteConnectionException(Messages.ControlChannel_Open_FailedCreateIOStream, e);
-		}
-
-		// Create stream observer and start it
-		controlTerminalObserver = new TextStreamObserver(inputFromControlTerminalOutput, this);
-		controlTerminalObserver.start();
-
-		try {
-			// Clean shell prompt.
-			outputToControlTerminalInput.write("export PS1=\n".getBytes()); //$NON-NLS-1$
-
-			// Write terminal path on control channel, to be read by the
-			// observer
-			String command = "/bin/sh -c 'echo \"" + markerSSH + "$SSH_TTY\"'\n"; //$NON-NLS-1$ //$NON-NLS-2$
-			outputToControlTerminalInput.write(command.getBytes());
-			outputToControlTerminalInput.flush();
-		} catch (IOException e) {
-			throw new RemoteConnectionException(Messages.ControlChannel_Open_FailedSendInitCommands, e);
-		}
-
-		// Wait until the channel answers the terminal path
-		Debug.println2(Messages.ControlChannel_Debug_StartedWaitingControlTerminalPath);
-		synchronized (this) {
-			while (!monitor.isCanceled() && controlTerminalPath == null) {
-				try {
-					this.wait(200);
-				} catch (InterruptedException e) {
-					throw new RemoteConnectionException(Messages.ControlChannel_Open_WaitControlTerminalPathInterrupted, e);
-				}
-			}
-		}
-		if (monitor.isCanceled()) {
-			close();
-			throw new RemoteConnectionException(Messages.ControlChannel_Open_WaitControlTerminalPathInterrupted);
-		}
-		Debug.println2(Messages.ControlChannel_Debug_ReceivedControlTerminalPath + controlTerminalPath);
-	}
-
-	public void newLine(String line) {
-		Debug.println2(Messages.ControlChannel_Debug_ControlConnectionReceived + line);
-		/*
-		 * Test if the line contains a PID.
-		 */
-		Matcher pidmatch = pidPattern.matcher(line);
-		if (pidmatch.find()) {
-			String pid = pidmatch.group(1);
-			String piid = pidmatch.group(2);
-			connection.setPID(Integer.parseInt(piid), Integer.parseInt(pid));
-			return;
-		}
-
-		Matcher terminalPathMatcher = terminalPathPattern.matcher(line);
-		if (terminalPathMatcher.find()) {
-			synchronized (this) {
-				controlTerminalPath = terminalPathMatcher.group(1);
-				Debug.println2(Messages.ControlChannel_0 + controlTerminalPath);
-				this.notifyAll();
-			}
-		}
-
-	}
-
-	public void streamClosed() {
-	}
-
-	public void streamError(Exception e) {
-		Debug.println2(Messages.ControlChannel_Debug_ControlConnectionReceived + e);
-	}
-
-	public synchronized String getControlTerminalPath() {
-		return controlTerminalPath;
-	}
-
-	public void killRemoteProcess(int pid) {
-		if (pid > 0) {
-			try {
-				outputToControlTerminalInput.write(new String("kill -9 " + pid + "\n").getBytes()); //$NON-NLS-1$ //$NON-NLS-2$
-				outputToControlTerminalInput.flush();
-			} catch (IOException e) {
-			}
-		}
-	}
-
-	public synchronized String getKillablePrefix(int internaID) {
-		return "echo \"" + markerPID + "$$ " //$NON-NLS-1$ //$NON-NLS-2$
-				+ markerPIID + Integer.toString(internaID) + "\" > " + controlTerminalPath; //$NON-NLS-1$
-	}
-
-	public void close() {
-		if (controlTerminalObserver != null) {
-			controlTerminalObserver.kill();
-		}
-		controlTerminalObserver = null;
-		outputToControlTerminalInput = null;
-		inputFromControlTerminalOutput = null;
-		if (shell != null) {
-			shell.disconnect();
-		}
-		shell = null;
-	}
-
-	public boolean isConnected() {
-		return shell != null && shell.isConnected();
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/CopyTools.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/CopyTools.java
deleted file mode 100755
index 6516474..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/CopyTools.java
+++ /dev/null

@@ -1,269 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 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 Implementation
- *     Roland Schulz, University of Tennessee
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Enumeration;
-
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.remotetools.core.IRemoteCopyTools;
-import org.eclipse.ptp.remotetools.core.IRemoteFileEnumeration;
-import org.eclipse.ptp.remotetools.core.messages.Messages;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-import org.eclipse.ptp.remotetools.internal.common.Debug;
-import org.eclipse.ptp.utils.core.file.FileEnumeration;
-import org.eclipse.ptp.utils.core.file.FileRecursiveEnumeration;
-
-
-public class CopyTools implements IRemoteCopyTools {
-	
-	private FileTools remoteFileTools;
-	
-	public CopyTools(ExecutionManager manager) throws RemoteConnectionException {
-		remoteFileTools = (FileTools)manager.getRemoteFileTools(); //TODO update interface
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteCopyTools#downloadFileToDir(java.lang.String, java.io.File)
-	 */
-	public void downloadFileToDir(String remotePath, File localDir) throws RemoteConnectionException, CancelException, RemoteOperationException {
-		remoteFileTools.validateRemotePath(remotePath);
-		File localFile = new File(localDir, remoteFileTools.suffixOfRemotePath(remotePath));
-		if (!localDir.exists()) {
-			if (! localDir.mkdirs()) {
-				throw new RemoteOperationException(NLS.bind(Messages.CopyTools_0, localDir.getAbsolutePath()));
-			}
-		}
-		doDownloadFileToFile(remotePath, localFile);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteCopyTools#downloadFileToDir(java.lang.String, java.lang.String)
-	 */
-	public void downloadFileToDir(String remotePath, String localPath) throws RemoteConnectionException, CancelException, RemoteOperationException {
-		File localDir = new File(localPath);
-		downloadFileToDir(remotePath, localDir);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteCopyTools#downloadFileToFile(java.lang.String, java.io.File)
-	 */
-	public void downloadFileToFile(String remotePath, File localFile) throws RemoteConnectionException, CancelException, RemoteOperationException {
-		remoteFileTools.validateRemotePath(remotePath);
-		File localDir = localFile.getParentFile();
-		if (!localDir.exists()) {
-			if (! localDir.mkdirs()) {
-				throw new RemoteOperationException(NLS.bind(Messages.CopyTools_0, localDir.getAbsolutePath()));
-			}
-		}
-		doDownloadFileToFile(remotePath, localFile);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteCopyTools#downloadFileToFile(java.lang.String, java.lang.String)
-	 */
-	public void downloadFileToFile(String remotePath, String localPath) throws RemoteConnectionException, CancelException, RemoteOperationException {
-		File localFile = new File(localPath);
-		downloadFileToFile(remotePath, localFile);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteCopyTools#uploadFileToDir(java.io.File, java.lang.String)
-	 */
-	public void uploadFileToDir(File localFile, String remotePath) throws RemoteConnectionException, CancelException, RemoteOperationException {
-//		remoteFileTools.validateRemotePath(localFile);
-		remoteFileTools.validateRemotePath(remotePath);
-		remoteFileTools.assureDirectory(remotePath, null);
-		remotePath = remoteFileTools.concatenateRemotePath(remotePath, localFile.getName());
-		doUploadFileToFile(localFile, remotePath);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteCopyTools#uploadFileToDir(java.lang.String, java.lang.String)
-	 */
-	public void uploadFileToDir(String localPath, String remotePath) throws RemoteConnectionException, CancelException, RemoteOperationException {
-		File localFile = new File(localPath);
-		uploadFileToDir(localFile, remotePath);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteCopyTools#uploadFileToFile(java.io.File, java.lang.String)
-	 */
-	public void uploadFileToFile(File localFile, String remotePath) throws RemoteConnectionException, CancelException, RemoteOperationException {
-		remoteFileTools.validateRemotePath(remotePath);
-		remoteFileTools.assureDirectory(remoteFileTools.parentOfRemotePath(remotePath), null);
-		doUploadFileToFile(localFile, remotePath);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteCopyTools#uploadFileToFile(java.lang.String, java.lang.String)
-	 */
-	public void uploadFileToFile(String localPath, String remotePath) throws RemoteConnectionException, CancelException, RemoteOperationException {
-		File localFile = new File(localPath);
-		uploadFileToFile(localFile, remotePath);
-	}
-
-	private void doDownloadFileToFile(String remotePath, File localFile) throws RemoteConnectionException, CancelException, RemoteOperationException {
-		FileOutputStream sink = null;
-		try {
-			sink = new FileOutputStream(localFile);
-			remoteFileTools.downloadIntoOutputStream(remotePath, sink, null);
-		} catch (FileNotFoundException e) {
-			throw new RemoteOperationException(NLS.bind(Messages.CopyTools_doDownloadFileToFile_CannotWriteFile, e.getMessage()), e);
-		} finally {
-			try {
-				if (sink!=null) sink.close();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-	}
-
-	private void doUploadFileToFile(File localFile, String remotePath) throws RemoteConnectionException, CancelException, RemoteOperationException {
-		FileInputStream source = null;
-		try {
-			source = new FileInputStream(localFile); 
-			remoteFileTools.uploadFromInputStream(source, remotePath, null);
-		} catch (FileNotFoundException e) {
-			throw new RemoteOperationException(NLS.bind(Messages.CopyTools_doUploadFileFromFile_CannotReadFile, e.getMessage()), e);
-		} finally {
-			try {
-				if (source!=null) source.close();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteCopyTools#downloadDirToDir(java.lang.String, java.io.File, boolean)
-	 */
-	public void downloadDirToDir(String remotePath, File localDir, boolean recursive) throws RemoteConnectionException, RemoteOperationException, CancelException {
-		remoteFileTools.validateRemotePath(remotePath);
-//		remoteFileTools.validateRemoteDir(remotePath);
-		remotePath = remoteFileTools.addTrailingSlash(remotePath);
-		if (!localDir.exists()) {
-			if (! localDir.mkdirs()) {
-				throw new RemoteOperationException(NLS.bind(Messages.CopyTools_0, localDir.getAbsolutePath()));
-			}
-		}
-	
-		IRemoteFileEnumeration enumeration;
-		try {
-			if (recursive) {
-				enumeration = new RemoteFileRecursiveEnumeration(remoteFileTools, remoteFileTools.removeTrailingSlash(remotePath));
-			} else {
-				enumeration = new RemoteFileEnumeration(remoteFileTools, remoteFileTools.removeTrailingSlash(remotePath));
-			}
-		} catch (IllegalArgumentException e) {
-			throw new RemoteOperationException(e.getMessage());
-		}
-		
-		while (enumeration.hasMoreElements()) {
-			String remoteFilePath = enumeration.nextElement().getPath();
-			String relativePath = remoteFilePath.substring(remotePath.length());
-			File localFile = new File(localDir, relativePath);
-		
-			if (remoteFileTools.hasDirectory(remoteFilePath, null)) {
-				// Create directory on the remote host
-				Debug.println("Create: " + remoteFilePath); //$NON-NLS-1$
-				if (!localFile.exists()) {
-					if (! localDir.mkdirs()) {
-						throw new RemoteOperationException(NLS.bind(Messages.CopyTools_0, localFile.getAbsolutePath()));
-					}
-				}
-			} else {
-				// Copy to the remote host
-				Debug.println(relativePath + " -> " + remoteFilePath); //$NON-NLS-1$
-				doDownloadFileToFile(remoteFilePath, localFile);
-			}
-		}
-	
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteCopyTools#downloadDirToDir(java.lang.String, java.lang.String, boolean)
-	 */
-	public void downloadDirToDir(String remotePath, String localPath, boolean recursive) throws RemoteConnectionException, RemoteOperationException, CancelException {
-		File localDir = new File(localPath);
-		downloadDirToDir(remotePath, localDir, recursive);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteCopyTools#uploadDirToDir(java.io.File, java.lang.String, boolean)
-	 */
-	public void uploadDirToDir(File localDir, String remotePath, boolean recursive) throws RemoteConnectionException, RemoteOperationException, CancelException {
-//		remoteFileTools.validateLocalDir(localDir);
-		remoteFileTools.validateRemotePath(remotePath);
-		remoteFileTools.assureDirectory(remotePath, null);
-		
-		Enumeration<File> enumeration;
-		try {
-			if (recursive) {
-				enumeration = new FileRecursiveEnumeration(localDir);
-			} else {
-				enumeration = new FileEnumeration(localDir);
-			}
-		} catch (IOException e) {
-			throw new RemoteOperationException(e.getMessage());
-		}		
-	
-		String rootPath;
-		try {
-			rootPath = localDir.getCanonicalPath();
-		} catch (IOException e) {
-			throw new RemoteOperationException(e);			
-		}
-		
-		while (enumeration.hasMoreElements()) {
-			File file = (File) enumeration.nextElement();
-			String relativePath;
-			try {
-				relativePath = file.getCanonicalPath().substring(rootPath.length()+1).replace('\\', '/');
-			} catch (IOException e) {
-				throw new RemoteOperationException(e);
-			}
-	
-			String remoteFilePath = remoteFileTools.concatenateRemotePath(remotePath, relativePath);
-			
-			if (file.isDirectory()) {
-				// Create directory on the remote host
-				Debug.println("Create: " + remoteFilePath); //$NON-NLS-1$
-				remoteFileTools.assureDirectory(remoteFilePath, null);
-				remoteFileTools.uploadPermissions(file.getAbsoluteFile(), remoteFilePath);
-			} else {
-				// Copy to the remote host
-				Debug.println(relativePath + " -> " + remoteFilePath); //$NON-NLS-1$
-				doUploadFileToFile(file, remoteFilePath);
-			}
-		}
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteCopyTools#uploadDirToDir(java.lang.String, java.lang.String, boolean)
-	 */
-	public void uploadDirToDir(String localPath, String remotePath, boolean recursive) throws RemoteConnectionException, RemoteOperationException, CancelException {
-		File localFile = new File(localPath);
-		uploadDirToDir(localFile, remotePath, recursive);
-	}
-
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/DownloadExecution.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/DownloadExecution.java
deleted file mode 100755
index a086a5d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/DownloadExecution.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.eclipse.ptp.remotetools.core.IRemoteDownloadExecution;
-import org.eclipse.ptp.remotetools.core.IRemotePathTools;
-import org.eclipse.ptp.remotetools.core.messages.Messages;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.internal.common.Debug;
-
-import com.jcraft.jsch.ChannelExec;
-
-public class DownloadExecution extends KillableExecution implements IRemoteDownloadExecution {
-
-	String remoteFile;
-	OutputStream sinkStream;
-	ByteArrayOutputStream errorStream;
-	InputStream inputStream;
-	
-	public DownloadExecution(ExecutionManager executionManager, String remoteFile, OutputStream sink) throws RemoteConnectionException {
-		super(executionManager);
-		this.remoteFile = remoteFile;
-		this.sinkStream = sink;
-		errorStream = new ByteArrayOutputStream();
-	}
-
-	public InputStream getInputStreamFromProcessRemoteFile() throws IOException {
-		if (sinkStream != null) {
-			throw new IllegalStateException();
-		}
-		return inputStream;
-	}
-
-	public void startExecution() throws RemoteConnectionException {
-		ChannelExec channel = createChannel(false);
-		IRemotePathTools pathTool = getExecutionManager().getRemotePathTools();
-		setCommandLine("cat " + pathTool.quote(remoteFile, true)); //$NON-NLS-1$
-		
-		if (sinkStream != null) {
-			channel.setOutputStream(sinkStream);
-			inputStream = null;
-		} else {
-			try {
-				inputStream = channel.getInputStream();
-			} catch (IOException e) {
-				throw new RemoteConnectionException(Messages.DownloadExecution_DownloadExecution_FailedCreateDownload, e);
-			}
-		}
-		channel.setErrStream(errorStream);
-		
-		super.startExecution();
-		Debug.println("Downloading " + remoteFile); //$NON-NLS-1$
-	}
-	
-	public String getErrorMessage() {
-		return errorStream.toString();
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ExecutionManager.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ExecutionManager.java
deleted file mode 100755
index 17460f3..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ExecutionManager.java
+++ /dev/null

@@ -1,339 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.ptp.remotetools.core.IRemoteCopyTools;
-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.IRemoteOperation;
-import org.eclipse.ptp.remotetools.core.IRemotePathTools;
-import org.eclipse.ptp.remotetools.core.IRemotePortForwardingTools;
-import org.eclipse.ptp.remotetools.core.IRemoteStatusTools;
-import org.eclipse.ptp.remotetools.core.IRemoteTunnel;
-import org.eclipse.ptp.remotetools.core.messages.Messages;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.LocalPortBoundException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.internal.common.RemoteTunnel;
-
-/**
- * @author Richard Maciel
- */
-public class ExecutionManager implements IRemoteExecutionManager {
-	/**
-	 * Tunnels created by this manager.
-	 */
-	Set<IRemoteTunnel> tunnels = new HashSet<IRemoteTunnel>();
-
-	/**
-	 * Remote executions created by this manager.
-	 */
-	Set<IRemoteOperation> executions = new HashSet<IRemoteOperation>();
-
-	/**
-	 * Connection created the execution manager.
-	 */
-	protected final Connection connection;
-
-	/**
-	 * The instance that provides execution facility methods.
-	 */
-	protected IRemoteExecutionTools executionTools = null;
-
-	/**
-	 * The instance that provides file manipulation facility methods.
-	 */
-	protected IRemoteFileTools fileTools = null;
-
-	/**
-	 * The instance that provides file transfer facility methods.
-	 */
-	protected IRemoteCopyTools copyTools = null;
-
-	/**
-	 * The instance that provides the path converter tool.
-	 */
-	protected IRemotePathTools pathTools = null;
-
-	/**
-	 * The instance that provides the status tool.
-	 */
-	protected IRemoteStatusTools statusTools = null;
-
-	/**
-	 * The instance that provides the port forwarding.
-	 */
-	protected IRemotePortForwardingTools portForwardingTools = null;
-
-	/**
-	 * Automatic-generated port attribute
-	 */
-	private static final int minPort = 10000;
-	private static final int maxPort = 65000;
-	private static int autoActualPort = minPort;
-
-	/**
-	 * Cancel flag. If true, no more operations are allowed on the this
-	 * execution manager.
-	 */
-	private boolean cancelFlag = false;
-
-	/**
-	 * Method that updates and return a new port number
-	 */
-	private synchronized static int getNewPortNumber() {
-		if (autoActualPort == maxPort)
-			autoActualPort = minPort;
-
-		return autoActualPort++;
-	}
-
-	/**
-	 * Class constructor. This method initializes control data and allocs a
-	 * control terminal.
-	 * 
-	 * @throws RemoteCommandException
-	 *             The manager could not be created.
-	 * 
-	 */
-	protected ExecutionManager(Connection connection) throws RemoteConnectionException {
-		this.connection = connection;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.remotetools.IRemoteExecutionManager#cancel()
-	 */
-	public synchronized void cancel() {
-		/*
-		 * Cancel all operations. Each operation implements its own logic how to
-		 * cancel. This simply broadcasts the cancel to all running operations.
-		 */
-		for (IRemoteOperation execution : new ArrayList<IRemoteOperation>(executions)) {
-			execution.cancel();
-		}
-		cancelFlag = true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteExecutionManager#resetCancel()
-	 */
-	public synchronized void resetCancel() {
-		cancelFlag = false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteExecutionManager#close()
-	 */
-	public synchronized void close() {
-		/*
-		 * Mark manager as canceled and interrupt ongoing operations.
-		 */
-		cancel();
-
-		/*
-		 * Close all tunnels.
-		 */
-		for (IRemoteTunnel tunnel : new ArrayList<IRemoteTunnel>(tunnels)) {
-			try {
-				// releaseTunnel() already removes the entry from the list.
-				releaseTunnel(tunnel);
-			} catch (RemoteConnectionException e) {
-			}
-		}
-		connection.getForwardingPool().disconnect(this);
-
-		/*
-		 * Close all channels for remote executions.
-		 */
-		for (IRemoteOperation execution : new ArrayList<IRemoteOperation>(executions)) {
-			execution.close();
-		}
-	}
-
-	/**
-	 * Get the connection used by the execution manager.
-	 */
-	protected Connection getConnection() {
-		return connection;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteExecutionManager#getExecutionTools
-	 * ()
-	 */
-	public IRemoteExecutionTools getExecutionTools() throws RemoteConnectionException {
-		if (executionTools == null) {
-			executionTools = new ExecutionTools(this);
-		}
-		return executionTools;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteExecutionManager#getRemoteFileTools
-	 * ()
-	 */
-	public IRemoteFileTools getRemoteFileTools() throws RemoteConnectionException {
-		if (fileTools == null) {
-			fileTools = new FileTools(this);
-		}
-		return fileTools;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteExecutionManager#getRemoteCopyTools
-	 * ()
-	 */
-	public IRemoteCopyTools getRemoteCopyTools() throws RemoteConnectionException {
-		if (copyTools == null) {
-			copyTools = new CopyTools(this);
-		}
-		return copyTools;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteExecutionManager#getRemotePathTools
-	 * ()
-	 */
-	public IRemotePathTools getRemotePathTools() {
-		if (pathTools == null) {
-			pathTools = new PathTools(this);
-		}
-		return pathTools;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteExecutionManager#getRemoteStatusTools
-	 * ()
-	 */
-	public IRemoteStatusTools getRemoteStatusTools() throws RemoteConnectionException {
-		if (statusTools == null) {
-			statusTools = new StatusTools(this);
-		}
-		return statusTools;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteExecutionManager#createTunnel
-	 * (int, java.lang.String, int)
-	 */
-	public synchronized IRemoteTunnel createTunnel(int localPort, String addressOnRemoteHost, int portOnRemoteHost)
-			throws RemoteConnectionException, LocalPortBoundException, CancelException {
-		test();
-		testCancel();
-		RemoteTunnel tunnel = connection.createTunnel(localPort, addressOnRemoteHost, portOnRemoteHost);
-		tunnels.add(tunnel);
-		return tunnel;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteExecutionManager#createTunnel
-	 * (java.lang.String, int)
-	 */
-	public synchronized IRemoteTunnel createTunnel(String addressOnRemoteHost, int portOnRemoteHost)
-			throws RemoteConnectionException, LocalPortBoundException, CancelException {
-		// Generate a local port automatically, before calling the createTunnel
-		// method passing it as parameter.
-		test();
-		testCancel();
-		int storedPort = getNewPortNumber();
-		int newGeneratedPort = storedPort;
-		while (true) {
-			try {
-				IRemoteTunnel tunnel = createTunnel(newGeneratedPort, addressOnRemoteHost, portOnRemoteHost);
-				return tunnel;
-			} catch (LocalPortBoundException e) {
-				// If the new port generated is equal the port we stored before
-				// the loop, all ports are probably busy
-				// so, generate an exception.
-				newGeneratedPort = getNewPortNumber();
-				if (newGeneratedPort == storedPort)
-					throw new LocalPortBoundException(Messages.ExecutionManager_CreateTunnel_AllLocalPortsBusy);
-			}
-		}
-
-	}
-
-	public synchronized void releaseTunnel(IRemoteTunnel tunnel) throws RemoteConnectionException {
-		try {
-			test();
-			connection.releaseTunnel((RemoteTunnel) tunnel);
-		} finally {
-			tunnels.remove(tunnel);
-		}
-	}
-
-	protected synchronized void registerOperation(IRemoteOperation operation) {
-		executions.add(operation);
-	}
-
-	protected synchronized void unregisterOperation(IRemoteOperation operation) {
-		executions.remove(operation);
-	}
-
-	/**
-	 * Throw an exception if the manager cannot execute commands.
-	 * 
-	 * @throws RemoteConnectionException
-	 *             The connection was lost.
-	 * @throws CancelException
-	 *             The manager is canceled.
-	 */
-	protected void test() throws RemoteConnectionException {
-		connection.test();
-	}
-
-	protected void testCancel() throws CancelException {
-		if (cancelFlag) {
-			throw new CancelException();
-		}
-	}
-
-	public IRemotePortForwardingTools getPortForwardingTools() throws RemoteConnectionException {
-		if (portForwardingTools == null) {
-			portForwardingTools = new PortForwardingTools(this);
-		}
-		return portForwardingTools;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ExecutionObserver.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ExecutionObserver.java
deleted file mode 100755
index 865cb3d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ExecutionObserver.java
+++ /dev/null

@@ -1,83 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 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
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.ptp.remotetools.core.messages.Messages;
-
-/**
- * Observer responsible for updating the list of running process.
- * 
- * Note: This must be a Thread not a Job as it may be run very early on in
- * Eclipse startup.
- * 
- * @author Richard Maciel
- * @since 1.1
- */
-public class ExecutionObserver extends Thread {
-	private final Connection fConnection;
-	private boolean fCanceled = false;
-
-	public ExecutionObserver(Connection connection) {
-		super(Messages.ExecutionObserver_ExecutionObserver_RemoteCommandObserver);
-		fConnection = connection;
-	}
-
-	public void cancel() {
-		fCanceled = true;
-		synchronized (this) {
-			notify();
-		}
-	}
-
-	/**
-	 * Check for executions and notify appropriately.
-	 * 
-	 * @param cancel
-	 *            if true, cancel all running executions, otherwise notify any
-	 *            finished executions
-	 */
-	private void checkAndNotify(boolean cancel) {
-		List<KillableExecution> execs;
-		synchronized (fConnection.getActiveProcessTable()) {
-			execs = new ArrayList<KillableExecution>(fConnection.getActiveProcessTable().values());
-		}
-		for (KillableExecution exec : execs) {
-			if (cancel && exec.isRunning()) {
-				exec.notifyCancel();
-			} else if (!cancel && !exec.isRunning()) {
-				exec.notifyFinish();
-			}
-		}
-	}
-
-	/**
-	 * Check for process that finished and remove then from the table until
-	 * there are no more process.
-	 */
-	@Override
-	public void run() {
-		while (!fCanceled && fConnection.isConnected()) {
-			checkAndNotify(false);
-			synchronized (this) {
-				try {
-					wait(100);
-				} catch (InterruptedException e) {
-					// Safe to ignore
-				}
-			}
-		}
-		checkAndNotify(true);
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ExecutionTools.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ExecutionTools.java
deleted file mode 100755
index 501216e..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ExecutionTools.java
+++ /dev/null

@@ -1,131 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.io.ByteArrayOutputStream;
-
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionTools;
-import org.eclipse.ptp.remotetools.core.IRemoteScript;
-import org.eclipse.ptp.remotetools.core.IRemoteScriptExecution;
-import org.eclipse.ptp.remotetools.core.RemoteProcess;
-import org.eclipse.ptp.remotetools.core.messages.Messages;
-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.internal.common.RemoteScript;
-
-
-/**
- * A set of facility methods for common execution patterns.
- * 
- * @author Richard Maciel
- */
-public class ExecutionTools implements IRemoteExecutionTools {
-	ExecutionManager manager;
-
-	protected ExecutionTools(ExecutionManager manager) {
-		this.manager = manager;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteExecutionTools#createScript()
-	 */
-	public IRemoteScript createScript() {
-		return new RemoteScript();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteExecutionTools#executeScript(org.eclipse.ptp.remotetools.core.IRemoteScript)
-	 */
-	public IRemoteScriptExecution executeScript(IRemoteScript remoteScript) throws RemoteConnectionException {
-		if (!(remoteScript instanceof RemoteScript)) {
-			throw new IllegalArgumentException();
-		}
-
-		
-		ScriptExecution actualExecution = new ScriptExecution(manager, (RemoteScript) remoteScript);
-		actualExecution.startExecution();
-
-
-		return actualExecution;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteExecutionTools#executeCommand(java.lang.String)
-	 */
-	public int executeWithExitValue(String command) throws RemoteExecutionException, RemoteConnectionException, CancelException {
-		IRemoteScript script = createScript();
-		script.setScript(command);
-	
-		IRemoteScriptExecution execution = executeScript(script);
-		execution.waitForEndOfExecution();
-		int returncode = execution.getReturnCode();
-		execution.close();
-
-		return returncode;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteExecutionTools#executeCommandWithOutput(java.lang.String)
-	 */
-	public String executeWithOutput(String command) throws RemoteExecutionException, RemoteConnectionException, CancelException {
-		IRemoteScript script = createScript();
-		script.setScript(command);
-		
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		script.setProcessOutputStream(baos);
-		
-		IRemoteScriptExecution execution = executeScript(script);
-		execution.waitForEndOfExecution();
-		execution.close();
-
-		return baos.toString();
-	}
-
-	public void executeBashCommand(String command) throws RemoteExecutionException, CancelException, RemoteConnectionException {
-		IRemoteScript script = createScript();
-		script.setScript(command);
-	
-		ByteArrayOutputStream baos1 = new ByteArrayOutputStream();
-		script.setProcessOutputStream(baos1);
-		ByteArrayOutputStream baos2 = new ByteArrayOutputStream();
-		script.setProcessErrorStream(baos2);
-		
-		IRemoteScriptExecution execution = executeScript(script);
-		execution.waitForEndOfExecution();
-		
-		int returncode = execution.getReturnCode();
-		execution.close();
-		
-		if (returncode != 0) {
-			throw new RemoteExecutionException(Messages.ExecutionTools_ExecuteBashCommand_FailedRunBashCommand, returncode, baos1.toString(), baos2.toString());
-		}
-	}
-
-	public RemoteProcess executeProcess(IRemoteScript remoteScript) throws RemoteExecutionException, CancelException, RemoteConnectionException {
-		remoteScript.setFetchProcessErrorStream(true);
-		remoteScript.setFetchProcessInputStream(true);
-		remoteScript.setFetchProcessOutputStream(true);
-		IRemoteScriptExecution execution = executeScript(remoteScript);
-		SSHRemoteProcess process = new SSHRemoteProcess(execution);
-		return process;
-	}
-
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/FileTools.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/FileTools.java
deleted file mode 100755
index da9b3c4..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/FileTools.java
+++ /dev/null

@@ -1,1025 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 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 Implementation
- *     Roland Schulz, University of Tennessee
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Set;
-import java.util.Vector;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.ptp.remotetools.core.IRemoteCopyTools;
-import org.eclipse.ptp.remotetools.core.IRemoteFileEnumeration;
-import org.eclipse.ptp.remotetools.core.IRemoteFileTools;
-import org.eclipse.ptp.remotetools.core.IRemoteItem;
-import org.eclipse.ptp.remotetools.core.IRemotePathTools;
-import org.eclipse.ptp.remotetools.core.messages.Messages;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteException;
-import org.eclipse.ptp.remotetools.exception.RemoteExecutionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-
-import com.jcraft.jsch.ChannelSftp;
-import com.jcraft.jsch.ChannelSftp.LsEntry;
-import com.jcraft.jsch.SftpATTRS;
-import com.jcraft.jsch.SftpException;
-import com.jcraft.jsch.SftpProgressMonitor;
-
-/**
- * @author Richard Maciel, Daniel Ferber
- * 
- */
-public class FileTools implements IRemoteFileTools {
-	public static class FileToolsProgressMonitor implements SftpProgressMonitor {
-		private final IProgressMonitor fMonitor;
-
-		public FileToolsProgressMonitor(IProgressMonitor monitor) {
-			fMonitor = monitor;
-		}
-
-		public boolean count(long count) {
-			fMonitor.worked((int) count);
-			return !(fMonitor.isCanceled());
-		}
-
-		public void end() {
-			fMonitor.done();
-		}
-
-		public void init(int op, String src, String dest, long max) {
-			String srcFile = new Path(src).lastSegment();
-			String desc = srcFile;
-			// TODO avoid cast from long to int
-			fMonitor.beginTask(desc, (int) max);
-		}
-	}
-
-	private abstract class SftpCallable<T> implements Callable<T> {
-		private ChannelSftp fSftpChannel = null;
-		private IProgressMonitor fProgressMonitor = null;
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see java.util.concurrent.Callable#call()
-		 */
-		public abstract T call() throws SftpException, IOException;
-
-		public ChannelSftp getChannel() {
-			return fSftpChannel;
-		}
-
-		public void setChannel(ChannelSftp channel) {
-			fSftpChannel = channel;
-		}
-
-		public IProgressMonitor getProgressMonitor() {
-			return fProgressMonitor;
-		}
-
-		private Future<T> asyncCmdInThread(String jobName) throws SftpException, IOException, RemoteConnectionException {
-			setChannel(getSFTPChannel());
-			return fPool.submit(this);
-		}
-
-		private void finalizeCmdInThread() {
-			releaseSFTPChannel(getChannel());
-			setChannel(null);
-		}
-
-		/**
-		 * Function opens sftp channel and then executes the sftp operation. If
-		 * run on the main thread it executes it on a separate thread
-		 */
-		public T syncCmdInThread(String jobName, IProgressMonitor monitor) throws RemoteConnectionException, SftpException,
-				IOException, RemoteOperationException, CancelException {
-			Future<T> future = null;
-			fProgressMonitor = SubMonitor.convert(monitor, 10);
-			try {
-				future = asyncCmdInThread(jobName);
-				return waitCmdInThread(future);
-			} finally {
-				finalizeCmdInThread();
-				if (monitor != null) {
-					monitor.done();
-				}
-			}
-		}
-
-		private T waitCmdInThread(Future<T> future) throws IOException, CancelException, SftpException, RemoteOperationException {
-			T ret = null;
-			boolean bInterrupted = Thread.interrupted();
-			while (ret == null) {
-				if (getProgressMonitor().isCanceled()) {
-					future.cancel(true);
-					getChannel().quit();
-					throw new CancelException();
-				}
-				try {
-					ret = future.get(100, TimeUnit.MILLISECONDS); // throws
-																	// InterruptedException
-																	// if
-																	// Thread.interrupted()
-																	// is true
-				} catch (InterruptedException e) {
-					bInterrupted = true;
-				} catch (TimeoutException e) {
-					// ignore
-				} catch (ExecutionException e) {
-					getChannel().quit(); // close sftp channel (gets
-											// automatically reopened) to make
-											// sure the channel is not in
-											// undefined state because of
-											// exception
-					if (e.getCause() instanceof IOException) {
-						throw (IOException) e.getCause();
-					}
-					if (e.getCause() instanceof SftpException) {
-						throw (SftpException) e.getCause();
-					}
-					throw new RemoteOperationException(e);
-				}
-				getProgressMonitor().worked(1);
-			}
-			if (bInterrupted) {
-				Thread.currentThread().interrupt(); // set current thread flag
-			}
-			return ret;
-		}
-	}
-
-	private static ExecutorService fPool = Executors.newSingleThreadExecutor();
-	protected ExecutionManager manager;
-	private int cachedUserID;
-	private Set<Integer> cachedGroupIDSet;
-	private String fOSName = null;
-
-	protected FileTools(ExecutionManager manager) {
-		this.manager = manager;
-	}
-
-	public String addTrailingSlash(String path) {
-		if (path.endsWith("/")) { //$NON-NLS-1$
-			return path;
-		} else {
-			return path + "/"; //$NON-NLS-1$
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteFileTools#assureDirectory(java
-	 * .lang.String)
-	 */
-	public void assureDirectory(String directory, IProgressMonitor monitor) throws RemoteOperationException,
-			RemoteConnectionException, CancelException {
-		final SubMonitor subMon = SubMonitor.convert(monitor, 10);
-		try {
-			test();
-			validateRemotePath(directory);
-			if (!hasDirectory(directory, subMon.newChild(5))) {
-				createDirectory(directory, subMon.newChild(5));
-			}
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteFileTools#canExecute(java.lang
-	 * .String)
-	 */
-	public boolean canExecute(String remotePath) throws RemoteOperationException, RemoteConnectionException, CancelException {
-		test();
-		validateRemotePath(remotePath);
-		RemoteItem item = (RemoteItem) getItem(remotePath);
-		return item.isExecutable();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteFileTools#canRead(java.lang.String
-	 * )
-	 */
-	public boolean canRead(String remotePath) throws RemoteOperationException, RemoteConnectionException, CancelException {
-		test();
-		validateRemotePath(remotePath);
-		RemoteItem item = (RemoteItem) getItem(remotePath);
-		return item.isReadable();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteFileTools#canWrite(java.lang.
-	 * String)
-	 */
-	public boolean canWrite(String remotePath) throws RemoteOperationException, RemoteConnectionException, CancelException {
-		test();
-		validateRemotePath(remotePath);
-		RemoteItem item = (RemoteItem) getItem(remotePath);
-		return item.isWritable();
-	}
-
-	public void chmod(final int permissions, final String path, IProgressMonitor monitor) throws RemoteOperationException,
-			RemoteConnectionException, CancelException {
-		final SubMonitor subMon = SubMonitor.convert(monitor, 10);
-		try {
-			test();
-			validateRemotePath(path);
-			SftpCallable<Integer> c = new SftpCallable<Integer>() {
-				@Override
-				public Integer call() throws SftpException {
-					getChannel().chmod(permissions, path);
-					return 0;
-				}
-			};
-			c.syncCmdInThread(Messages.FileTools_2, subMon.newChild(10));
-		} catch (IOException e) {
-			throw new RemoteOperationException(e);
-		} catch (SftpException e) {
-			throw new RemoteOperationException(e);
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-
-	}
-
-	public String concatenateRemotePath(String p1, String p2) {
-		if (p1.endsWith("/")) { //$NON-NLS-1$
-			return p1 + p2;
-		} else {
-			return p1 + "/" + p2; //$NON-NLS-1$
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteFileTools#copyFile(java.lang.
-	 * String, java.lang.String)
-	 */
-	public void copyFile(String from, String to, IProgressMonitor monitor) throws RemoteOperationException,
-			RemoteConnectionException, CancelException {
-		try {
-			test();
-			validateRemotePath(from);
-			validateRemotePath(to);
-
-			IRemotePathTools pathTool = manager.getRemotePathTools();
-			try {
-				executeCommand("cp -f " + pathTool.quote(from, true) + " " + pathTool.quote(to, true));//$NON-NLS-1$ //$NON-NLS-2$
-			} catch (RemoteExecutionException e) {
-				throw new RemoteOperationException(e);
-			}
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteFileTools#createDirectory(java
-	 * .lang.String)
-	 */
-	public void createDirectory(String directory, IProgressMonitor monitor) throws RemoteOperationException,
-			RemoteConnectionException, CancelException {
-		final SubMonitor subMon = SubMonitor.convert(monitor, 10);
-		try {
-			test();
-			validateRemotePath(directory);
-			IRemotePathTools pathTool = manager.getRemotePathTools();
-
-			final String path = pathTool.quote(directory, true);
-			String parent = pathTool.parent(path);
-
-			RemoteFileAttributes attrs = fetchRemoteAttr(parent, subMon.newChild(5));
-			if (attrs == null) {
-				createDirectory(parent, monitor);
-			}
-
-			try {
-				SftpCallable<Integer> c = new SftpCallable<Integer>() {
-					@Override
-					public Integer call() throws SftpException {
-						getChannel().mkdir(path);
-						return 0;
-					}
-				};
-				c.syncCmdInThread(Messages.FileTools_3, subMon.newChild(5));
-			} catch (IOException e) {
-				throw new RemoteOperationException(e);
-			} catch (SftpException e) {
-				throw new RemoteOperationException(e);
-			}
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteFileTools#createFile(java.lang
-	 * .String)
-	 */
-	public void createFile(String file, IProgressMonitor monitor) throws RemoteOperationException, RemoteConnectionException,
-			CancelException {
-		final SubMonitor subMon = SubMonitor.convert(monitor, 10);
-		try {
-			test();
-			validateRemotePath(file);
-			IRemotePathTools pathTool = manager.getRemotePathTools();
-			final String path = pathTool.quote(file, true);
-
-			try {
-				SftpCallable<Integer> c = new SftpCallable<Integer>() {
-					@Override
-					public Integer call() throws SftpException, IOException {
-						OutputStream os = getChannel().put(path);
-						os.close();
-						return 0;
-					}
-				};
-				c.syncCmdInThread(Messages.FileTools_4, subMon.newChild(10));
-			} catch (IOException e) {
-				throw new RemoteOperationException(e);
-			} catch (SftpException e) {
-				throw new RemoteOperationException(e);
-			}
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteFileTools#createFileEnumeration
-	 * (java.lang.String)
-	 */
-	public IRemoteFileEnumeration createFileEnumeration(String path) throws RemoteOperationException, RemoteConnectionException,
-			CancelException {
-		return new RemoteFileEnumeration(this, path);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteFileTools#
-	 * createRecursiveFileEnumeration(java.lang.String)
-	 */
-	public IRemoteFileEnumeration createRecursiveFileEnumeration(String path) throws RemoteOperationException,
-			RemoteConnectionException, CancelException {
-		return new RemoteFileRecursiveEnumeration(this, path);
-	}
-
-	public void downloadIntoOutputStream(final String remotePath, final OutputStream sink, IProgressMonitor monitor)
-			throws RemoteOperationException, RemoteConnectionException, CancelException {
-		final SubMonitor subMon = SubMonitor.convert(monitor, 10);
-		try {
-			test();
-			validateRemotePath(remotePath);
-			SftpCallable<Integer> c = new SftpCallable<Integer>() {
-				@Override
-				public Integer call() throws SftpException {
-					getChannel().get(remotePath, sink);
-					return 0;
-				}
-			};
-			c.syncCmdInThread(Messages.FileTools_5, subMon.newChild(10));
-		} catch (IOException e) {
-			throw new RemoteOperationException(e);
-		} catch (SftpException e) {
-			throw new RemoteOperationException(e);
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-	}
-
-	public Set<Integer> getCachedGroupIDSet() {
-		return cachedGroupIDSet;
-	}
-
-	public int getCachedUserID() {
-		return cachedUserID;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteFileTools#getDirectory(java.lang
-	 * .String)
-	 */
-	public IRemoteItem getDirectory(String directoryPath, IProgressMonitor monitor) throws RemoteOperationException,
-			RemoteConnectionException, CancelException, RemoteOperationException {
-		final SubMonitor subMon = SubMonitor.convert(monitor, 10);
-		try {
-			test();
-			validateRemotePath(directoryPath);
-			directoryPath = removeTrailingSlash(directoryPath);
-			cacheUserData();
-
-			IRemoteItem remfile = new RemoteItem(this, directoryPath);
-			remfile.refreshAttributes(subMon.newChild(10));
-			if (!remfile.isDirectory()) {
-				throw new RemoteOperationException(Messages.FileTools_6);
-			}
-			return remfile;
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteFileTools#getFile(java.lang.String
-	 * )
-	 */
-	public IRemoteItem getFile(String filePath, IProgressMonitor monitor) throws RemoteOperationException,
-			RemoteConnectionException, CancelException, RemoteOperationException {
-		final SubMonitor subMon = SubMonitor.convert(monitor, 10);
-		try {
-			test();
-			validateRemotePath(filePath);
-			filePath = removeTrailingSlash(filePath);
-			cacheUserData();
-
-			IRemoteItem remfile = new RemoteItem(this, filePath);
-			remfile.refreshAttributes(subMon.newChild(10));
-			if (remfile.isDirectory()) {
-				throw new RemoteOperationException(Messages.FileTools_7);
-			}
-			return remfile;
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteFileTools#getInputStream(java
-	 * .lang.String, int, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public InputStream getInputStream(String file, IProgressMonitor monitor) throws RemoteOperationException,
-			RemoteConnectionException, CancelException {
-		final SubMonitor subMon = SubMonitor.convert(monitor, 10);
-		try {
-			test();
-			validateRemotePath(file);
-			IRemotePathTools pathTool = manager.getRemotePathTools();
-			final String path = pathTool.quote(file, true);
-
-			final ByteArrayOutputStream out = new ByteArrayOutputStream();
-
-			try {
-				SftpCallable<Integer> c = new SftpCallable<Integer>() {
-					@Override
-					public Integer call() throws SftpException, IOException {
-						SubMonitor mon = SubMonitor.convert(getProgressMonitor(), 10);
-						getChannel().get(path, out, new FileToolsProgressMonitor(mon.newChild(10)));
-						out.close();
-						return 0;
-					}
-				};
-				c.syncCmdInThread(Messages.FileTools_8, subMon.newChild(10));
-				return new ByteArrayInputStream(out.toByteArray());
-			} catch (IOException e) {
-				throw new RemoteOperationException(e);
-			} catch (SftpException e) {
-				throw new RemoteOperationException(e);
-			}
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteFileTools#getItem(java.lang.String
-	 * )
-	 */
-	public IRemoteItem getItem(String path) throws RemoteConnectionException, RemoteOperationException, CancelException,
-			RemoteOperationException {
-		test();
-		validateRemotePath(path);
-		path = removeTrailingSlash(path);
-		cacheUserData();
-
-		return new RemoteItem(this, path);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteFileTools#getOutputStream(java
-	 * .lang.String, int, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public OutputStream getOutputStream(String file, int options, IProgressMonitor monitor) throws RemoteOperationException,
-			RemoteConnectionException, CancelException {
-		final SubMonitor subMon = SubMonitor.convert(monitor, 10);
-		try {
-			test();
-			validateRemotePath(file);
-			IRemotePathTools pathTool = manager.getRemotePathTools();
-			final String path = pathTool.quote(file, true);
-
-			final int mode;
-			if ((options & IRemoteFileTools.APPEND) == 0) {
-				mode = ChannelSftp.OVERWRITE;
-			} else {
-				mode = ChannelSftp.APPEND;
-			}
-
-			return new ByteArrayOutputStream() {
-				@Override
-				public void close() throws IOException {
-					super.close();
-					final InputStream is = new ByteArrayInputStream(this.toByteArray());
-					try {
-						SftpCallable<Integer> c = new SftpCallable<Integer>() {
-							@Override
-							public Integer call() throws SftpException, IOException {
-								SubMonitor mon = SubMonitor.convert(getProgressMonitor(), 10);
-								getChannel().put(is, path, new FileToolsProgressMonitor(mon.newChild(10)), mode);
-								is.close();
-								return 0;
-							}
-						};
-						c.syncCmdInThread(Messages.FileTools_9, subMon.newChild(10));
-					} catch (SftpException e) {
-						throw new IOException(e.getMessage());
-					} catch (RemoteException e) {
-						throw new IOException(e.getMessage());
-					} catch (CancelException e) {
-						throw new IOException(e.getMessage());
-					}
-				}
-			};
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteFileTools#getRemoteCopyTools()
-	 */
-	public IRemoteCopyTools getRemoteCopyTools() throws RemoteConnectionException {
-		return manager.getRemoteCopyTools();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.internal.ssh.teste#hasDirectory(java.lang
-	 * .String)
-	 */
-	public boolean hasDirectory(String directory, IProgressMonitor monitor) throws RemoteOperationException,
-			RemoteConnectionException, CancelException {
-		SubMonitor subMon = SubMonitor.convert(monitor, 10);
-		try {
-			test();
-			validateRemotePath(directory);
-			RemoteItem item = (RemoteItem) getItem(directory);
-			item.refreshAttributes(subMon.newChild(10));
-			if (!item.exists()) {
-				return false;
-			}
-			if (!item.isDirectory()) {
-				return false;
-			}
-			return true;
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.internal.ssh.teste#hasFile(java.lang.String)
-	 */
-	public boolean hasFile(String file, IProgressMonitor monitor) throws RemoteOperationException, RemoteConnectionException,
-			CancelException {
-		final SubMonitor subMon = SubMonitor.convert(monitor, 10);
-		try {
-			test();
-			validateRemotePath(file);
-			IRemoteItem item = getItem(file);
-			item.refreshAttributes(subMon.newChild(10));
-			if (!item.exists()) {
-				return false;
-			}
-			if (item.isDirectory()) {
-				return false;
-			}
-			return true;
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteFileTools#listItems(java.lang
-	 * .String)
-	 */
-	@SuppressWarnings("unchecked")
-	public IRemoteItem[] listItems(final String root, IProgressMonitor monitor) throws RemoteOperationException,
-			RemoteConnectionException, CancelException {
-		final SubMonitor subMon = SubMonitor.convert(monitor, 10);
-		try {
-			validateRemotePath(root);
-			Vector<LsEntry> files;
-
-			try {
-				SftpCallable<Vector<LsEntry>> c = new SftpCallable<Vector<LsEntry>>() {
-					@Override
-					public Vector<LsEntry> call() throws SftpException {
-						return getChannel().ls(root);
-					}
-				};
-				files = c.syncCmdInThread(Messages.FileTools_10, subMon.newChild(10));
-			} catch (IOException e) {
-				throw new RemoteOperationException(e);
-			} catch (SftpException e) {
-				throw new RemoteOperationException(e);
-			}
-
-			cacheUserData();
-
-			List<RemoteItem> result = new ArrayList<RemoteItem>();
-			Enumeration<LsEntry> enumeration = files.elements();
-			while (enumeration.hasMoreElements()) {
-				LsEntry entry = enumeration.nextElement();
-				String fileName = entry.getFilename();
-				String pathName = concatenateRemotePath(root, fileName);
-				if (fileName.equals(".") || fileName.equals("..")) { //$NON-NLS-1$ //$NON-NLS-2$
-					// Ignore parent and current dir entry.
-					continue;
-				}
-				result.add(new RemoteItem(this, pathName, entry.getAttrs()));
-			}
-
-			IRemoteItem[] resultArray = new IRemoteItem[result.size()];
-			result.toArray(resultArray);
-			return resultArray;
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteFileTools#moveFile(java.lang.
-	 * String, java.lang.String)
-	 */
-	public void moveFile(String from, String to, IProgressMonitor monitor) throws RemoteOperationException,
-			RemoteConnectionException, CancelException {
-		try {
-			test();
-			validateRemotePath(from);
-			validateRemotePath(to);
-			IRemotePathTools pathTool = manager.getRemotePathTools();
-			try {
-				executeCommand("mv -f " + pathTool.quote(from, true) + " " + pathTool.quote(to, true)); //$NON-NLS-1$ //$NON-NLS-2$
-			} catch (RemoteExecutionException e) {
-				throw new RemoteOperationException(e);
-			}
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-
-	}
-
-	public String parentOfRemotePath(String path) {
-		path = removeTrailingSlash(path);
-		int index = path.lastIndexOf('/');
-		if (index == -1)
-			return null;
-		return removeTrailingSlash(path.substring(0, index));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteFileTools#removeDirectory(java
-	 * .lang.String)
-	 */
-	public void removeDirectory(String dir, IProgressMonitor monitor) throws RemoteOperationException, RemoteConnectionException,
-			CancelException {
-		try {
-			test();
-			validateRemotePath(dir);
-			IRemotePathTools pathTool = manager.getRemotePathTools();
-			try {
-				executeCommand("rm -rf " + pathTool.quote(dir, true)); //$NON-NLS-1$
-			} catch (RemoteExecutionException e) {
-				throw new RemoteOperationException(e);
-			}
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemoteFileTools#removeFile(java.lang
-	 * .String)
-	 */
-	public void removeFile(String file, IProgressMonitor monitor) throws RemoteOperationException, RemoteConnectionException,
-			CancelException {
-		final SubMonitor subMon = SubMonitor.convert(monitor, 10);
-		try {
-			test();
-			validateRemotePath(file);
-			IRemotePathTools pathTool = manager.getRemotePathTools();
-			final String path = pathTool.quote(file, true);
-
-			try {
-				SftpCallable<Integer> c = new SftpCallable<Integer>() {
-					@Override
-					public Integer call() throws SftpException {
-						getChannel().rm(path);
-						return 0;
-					}
-				};
-				c.syncCmdInThread(Messages.FileTools_12, subMon.newChild(10));
-			} catch (IOException e) {
-				throw new RemoteOperationException(e);
-			} catch (SftpException e) {
-				throw new RemoteOperationException(e);
-			}
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-
-	}
-
-	public String removeTrailingSlash(String path) {
-		if (!path.equals("/") && path.endsWith("/")) { //$NON-NLS-1$ //$NON-NLS-2$
-			return path.substring(0, path.length() - 1);
-		} else {
-			return path;
-		}
-	}
-
-	public void setMtime(final String path, final int mtime, IProgressMonitor monitor) throws RemoteOperationException,
-			RemoteConnectionException, CancelException {
-		final SubMonitor subMon = SubMonitor.convert(monitor, 10);
-		try {
-			test();
-			validateRemotePath(path);
-			SftpCallable<Integer> c = new SftpCallable<Integer>() {
-				@Override
-				public Integer call() throws SftpException {
-					getChannel().setMtime(path, mtime);
-					return 0;
-				}
-			};
-			c.syncCmdInThread(Messages.FileTools_13, subMon.newChild(10));
-		} catch (IOException e) {
-			throw new RemoteOperationException(e);
-		} catch (SftpException e) {
-			throw new RemoteOperationException(e);
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-	}
-
-	public String suffixOfRemotePath(String path) {
-		path = removeTrailingSlash(path);
-		int index = path.lastIndexOf('/');
-		if (index == -1)
-			return null;
-		return removeTrailingSlash(path.substring(index + 1));
-	}
-
-	public void uploadFromInputStream(final InputStream source, final String remotePath, IProgressMonitor monitor)
-			throws RemoteOperationException, RemoteConnectionException, CancelException {
-		final SubMonitor subMon = SubMonitor.convert(monitor, 10);
-		try {
-			test();
-			validateRemotePath(remotePath);
-			SftpCallable<Integer> c = new SftpCallable<Integer>() {
-				@Override
-				public Integer call() throws SftpException {
-					getChannel().put(source, remotePath);
-					return 0;
-				}
-			};
-			c.syncCmdInThread(Messages.FileTools_14, subMon.newChild(10));
-		} catch (IOException e) {
-			throw new RemoteOperationException(e);
-		} catch (SftpException e) {
-			throw new RemoteOperationException(e);
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-	}
-
-	/**
-	 * @throws CancelException
-	 * @throws RemoteOperationException
-	 * @throws RemoteConnectionException
-	 * @deprecated
-	 */
-	@Deprecated
-	public void uploadPermissions(File file, String remoteFilePath) throws RemoteConnectionException, RemoteOperationException,
-			CancelException {
-		IRemoteItem item = getItem(remoteFilePath);
-		item.setReadable(file.canRead());
-		item.setWriteable(file.canWrite());
-		item.commitAttributes(null);
-	}
-
-	public void validateRemotePath(String path) throws RemoteOperationException {
-		if (!path.startsWith("/")) { //$NON-NLS-1$
-			throw new RemoteOperationException(path + Messages.RemoteFileTools_ValidateRemotePath_NotValid);
-		}
-	}
-
-	private void cacheUserData() throws RemoteConnectionException, RemoteOperationException, CancelException {
-		if (cachedGroupIDSet == null) {
-			cachedGroupIDSet = manager.getRemoteStatusTools().getGroupIDSet();
-			cachedUserID = manager.getRemoteStatusTools().getUserID();
-		}
-	}
-
-	private boolean checkOSName(String name) {
-		if (fOSName == null) {
-			try {
-				fOSName = manager.getExecutionTools().executeWithOutput("uname").trim(); //$NON-NLS-1$
-			} catch (RemoteExecutionException e) {
-				return false;
-			} catch (RemoteConnectionException e) {
-				return false;
-			} catch (CancelException e) {
-				return false;
-			}
-		}
-		return fOSName.equals(name);
-	}
-
-	private ChannelSftp getSFTPChannel() throws RemoteConnectionException {
-		return manager.connection.getSFTPChannel();
-	}
-
-	private void releaseSFTPChannel(ChannelSftp sftp) {
-		manager.connection.releaseSFTPChannel(sftp);
-	}
-
-	protected void executeCommand(String command) throws RemoteConnectionException, RemoteExecutionException, CancelException {
-		manager.executionTools.executeBashCommand(command);
-	}
-
-	/**
-	 * Read attributes of the remote file.
-	 * 
-	 * @param path
-	 * @return A Jsch data structure with attributes or null if path does not
-	 *         exist.
-	 * @throws RemoteConnectionException
-	 * @throws RemoteExecutionException
-	 */
-	protected RemoteFileAttributes fetchRemoteAttr(final String path, IProgressMonitor monitor) throws RemoteOperationException,
-			CancelException, RemoteConnectionException {
-		final SubMonitor subMon = SubMonitor.convert(monitor, 10);
-		try {
-			test();
-			validateRemotePath(path);
-			SftpCallable<SftpATTRS> c = new SftpCallable<SftpATTRS>() {
-				@Override
-				public SftpATTRS call() throws SftpException {
-					return getChannel().stat(path);
-				}
-			};
-			SftpATTRS attrs = c.syncCmdInThread(Messages.FileTools_15, subMon.newChild(10));
-			return RemoteFileAttributes.getAttributes(attrs);
-		} catch (SftpException e) {
-			if ((e).id == ChannelSftp.SSH_FX_NO_SUCH_FILE) {
-				return null;
-			}
-			throw new RemoteOperationException(e);
-		} catch (IOException e) {
-			throw new RemoteOperationException(e);
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-	}
-
-	protected void test() throws RemoteConnectionException, CancelException {
-		manager.test();
-		manager.testCancel();
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/KillableExecution.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/KillableExecution.java
deleted file mode 100755
index 840c886..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/KillableExecution.java
+++ /dev/null

@@ -1,371 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import org.eclipse.ptp.remotetools.core.messages.Messages;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.internal.common.AbstractRemoteExecution;
-import org.eclipse.ptp.remotetools.internal.common.Debug;
-
-import com.jcraft.jsch.ChannelExec;
-import com.jcraft.jsch.JSchException;
-
-/**
- * A remote execution that can be canceled by killing the running bash command.
- * 
- * @author Daniel Felix Ferber
- * 
- */
-public abstract class KillableExecution extends AbstractRemoteExecution {
-
-	private ChannelExec channel;
-	/**
-	 * Internal process identifier.
-	 */
-	private int PIID;
-	/**
-	 * Process id on the remote host.
-	 */
-	private int PID;
-
-	public KillableExecution(ExecutionManager executionManager) throws RemoteConnectionException {
-		super(executionManager);
-	}
-
-	public void startExecution() throws RemoteConnectionException {
-		try {
-			getExecutionManager().registerOperation(this);
-			getExecutionManager().getConnection().registerObservedExecution(this);
-			channel.connect();
-		} catch (JSchException e) {
-			throw new RemoteConnectionException(e.getLocalizedMessage());
-		}
-	}
-
-	protected void notifyCancel() {
-		/*
-		 * Stop observing this channel.
-		 */
-		getExecutionManager().unregisterOperation(this);
-		getExecutionManager().getConnection().unregisterObservedExecution(this);
-		/*
-		 * Force the end of the execution by closing the channel and killing (SIGHUP or something simular) on the remote
-		 * host. Remote the channel from the connection pool.
-		 */
-		getExecutionManager().getConnection().killExecution(this);
-		getExecutionManager().getConnection().releaseChannel(channel);
-		super.notifyCancel();
-	}
-
-	protected void notifyFinish() {
-		/*
-		 * Stop observing this channel.
-		 * Remote the channel from the connection pool
-		 */
-		getExecutionManager().unregisterOperation(this);
-		getExecutionManager().getConnection().unregisterObservedExecution(this);
-		getExecutionManager().getConnection().releaseChannel(channel);
-		super.notifyFinish();
-	}
-
-	public void close() {
-		/*
-		 * Cancel execution, if still not finished. 
-		 * Then, make sure the channel is closed and released from the execution manager.
-		 */
-		if (isRunning()) {
-			cancel();
-		}
-		super.close();
-	}
-
-	protected ChannelExec createChannel(boolean hasPTY) throws RemoteConnectionException {
-		/*
-		 * Get a channel from the connection pool.
-		 * Channels with PTY must be managed by the pool.
-		 */
-		channel = getExecutionManager().getConnection().createExecChannel(hasPTY);
-		channel.setPty(hasPTY);
-		return channel;
-	}
-
-	/**
-	 * Create a killable command line that will run on any system.
-	 * 
-	 * 1. The whole command is run using /bin/sh to ensure that it will work
-	 *    on any system.
-	 * 2. The killable prefix echos the PID of the shell to the control terminal. This
-	 *    is read by the connection manager and can be used to send a kill signal
-	 *    in order to terminate the process.
-	 *    
-	 * NOTE: there is a maximum line length on most systems. If this is exceeded
-	 * the command will fail.
-	 *     
-	 * @param commandLine command line to run
-	 */
-	protected void setCommandLine(String commandLine) {
-		PIID = getExecutionManager().getConnection().createNextPIID();
-		
-		String newCommandLine = "/bin/sh -c '" //$NON-NLS-1$
-			+ getExecutionManager().getConnection().getKillablePrefix(this) 
-			+ "; " //$NON-NLS-1$
-			+ commandLine 
-			+ "'"; //$NON-NLS-1$
-		
-		Debug.println2(Messages.KillableExecution_Debug_1 + newCommandLine);
-		channel.setCommand(newCommandLine);
-	}
-
-	public int getReturnCode() {
-		if (wasCanceled()) {
-			return -1;
-		} else if (!wasFinished()) {
-			throw new IllegalStateException();
-		}
-		return channel.getExitStatus();
-	}
-
-	public int getPID() {
-		return PID;
-	}
-
-	public void setPID(int pid) {
-		PID = pid;
-	}
-
-	public int getInternaID() {
-		return PIID;
-	}
-
-	public boolean isRunning() {
-		return !channel.isClosed();
-	}
-
-	public int getFinishStatus() {
-		int code = getReturnCode();
-
-		if (code == 0) {
-			return SUCCESS_OK;
-		} else if (code <= 125) {
-			return SUCCESS_ERROR;
-		} else if (code == 126) {
-			return ERROR_NOT_EXECUTABLE;
-		} else if (code == 127) {
-			return ERROR_NOT_FOUND;
-		} else if (code == 128) {
-			return UNKNOWN;
-		} else if (code == 255) {
-			return INVALID_EXIT_CODE;
-		} else if (code == 128 + 1) {
-			return SIGHUP;
-		} else if (code == 128 + 2) {
-			return SIGINT;
-		} else if (code == 128 + 3) {
-			return SIGQUIT;
-		} else if (code == 128 + 4) {
-			return SIGILL;
-		} else if (code == 128 + 5) {
-			return SIGTRAP;
-		} else if (code == 128 + 6) {
-			return SIGIOT;
-		} else if (code == 128 + 7) {
-			return SIGBUS;
-		} else if (code == 128 + 8) {
-			return SIGFPE;
-		} else if (code == 128 + 9) {
-			return SIGKILL;
-		} else if (code == 128 + 10) {
-			return SIGUSR1;
-		} else if (code == 128 + 11) {
-			return SIGSEGV;
-		} else if (code == 128 + 12) {
-			return SIGUSR2;
-		} else if (code == 128 + 13) {
-			return SIGPIPE;
-		} else if (code == 128 + 14) {
-			return SIGALRM;
-		} else if (code == 128 + 15) {
-			return SIGTERM;
-		} else if (code == 128 + 16) {
-			return SIGSTKFLT;
-		} else if (code == 128 + 17) {
-			return SIGCHLD;
-		} else if (code == 128 + 18) {
-			return SIGCONT;
-		} else if (code == 128 + 19) {
-			return SIGSTOP;
-		} else if (code == 128 + 20) {
-			return SIGTSTP;
-		} else if (code == 128 + 21) {
-			return SIGTTIN;
-		} else if (code == 128 + 22) {
-			return SIGTTOU;
-		} else if (code == 128 + 23) {
-			return SIGURG;
-		} else if (code == 128 + 24) {
-			return SIGXCPU;
-		} else if (code == 128 + 25) {
-			return SIGXFSZ;
-		} else if (code == 128 + 26) {
-			return SIGVTALRM;
-		} else if (code == 128 + 27) {
-			return SIGPROF;
-		} else if (code == 128 + 28) {
-			return SIGWINCH;
-		} else if (code == 128 + 29) {
-			return SIGIO;
-		} else if (code == 128 + 30) {
-			return SIGPWR;
-		} else {
-			return UNKNOWN;
-		}
-	}
-
-	public String getFinishStatusText(int status) {
-		switch (status) {
-		case SUCCESS_OK:
-			return Messages.KillableExecution_FinishStatus_Ok;
-		case SUCCESS_ERROR:
-			return Messages.KillableExecution_FinishStatus_Error;
-		case ERROR_NOT_EXECUTABLE:
-			return Messages.KillableExecution_FinishStatus_NotExecutable;
-		case ERROR_NOT_FOUND:
-			return Messages.KillableExecution_FinishStatus_CommandNotFound;
-		case INVALID_EXIT_CODE:
-			return Messages.KillableExecution_FinishStatus_InvalidExitCode;
-		case SIGHUP:
-			return Messages.KillableExecution_FinishStatus_Hangup;
-		case SIGINT:
-			return Messages.KillableExecution_FinishStatus_TerminalInterrupt;
-		case SIGQUIT:
-			return Messages.KillableExecution_FinishStatus_TerminalQuit;
-		case SIGILL:
-			return Messages.KillableExecution_FinishStatus_IllegalInstruction;
-		case SIGTRAP:
-			return Messages.KillableExecution_FinishStatus_TraceTrap;
-		case SIGIOT:
-			return Messages.KillableExecution_FinishStatus_IOTTrap;
-		case SIGBUS:
-			return Messages.KillableExecution_FinishStatus_BUSError;
-		case SIGFPE:
-			return Messages.KillableExecution_FinishStatus_FloatingPointException;
-		case SIGKILL:
-			return Messages.KillableExecution_FinishStatus_Kill;
-		case SIGUSR1:
-			return Messages.KillableExecution_FinishStatus_UserDefinedSignal1;
-		case SIGSEGV:
-			return Messages.KillableExecution_FinishStatus_InvalidMemorySegmentAccess;
-		case SIGUSR2:
-			return Messages.KillableExecution_FinishStatus_UserDefinedSignal2;
-		case SIGPIPE:
-			return Messages.KillableExecution_FinishStatus_BrokenPipe;
-		case SIGALRM:
-			return Messages.KillableExecution_FinishStatus_AlarmClock;
-		case SIGTERM:
-			return Messages.KillableExecution_FinishStatus_Termination;
-		case SIGSTKFLT:
-			return Messages.KillableExecution_FinishStatus_StackFault;
-		case SIGCHLD:
-			return Messages.KillableExecution_FinishStatus_ChildProcessStoppedOrExited;
-		case SIGCONT:
-			return Messages.KillableExecution_FinishStatus_ContinueExecuting;
-		case SIGSTOP:
-			return Messages.KillableExecution_FinishStatus_StopExecuting;
-		case SIGTSTP:
-			return Messages.KillableExecution_FinishStatus_TerminalStopSignal;
-		case SIGTTIN:
-			return Messages.KillableExecution_FinishStatus_BackgroundProcessReadTTY;
-		case SIGTTOU:
-			return Messages.KillableExecution_FinishStatus_BackgroundWriteTTY;
-		case SIGURG:
-			return Messages.KillableExecution_FinishStatus_UrgentConditionSocket;
-		case SIGXCPU:
-			return Messages.KillableExecution_FinishStatus_CPULimitExceeded;
-		case SIGXFSZ:
-			return Messages.KillableExecution_FinishStatus_FileSizeLimitExceeded;
-		case SIGVTALRM:
-			return Messages.KillableExecution_FinishStatus_VirtualAlarmClock;
-		case SIGPROF:
-			return Messages.KillableExecution_FinishStatus_ProfilingAlarmClock;
-		case SIGWINCH:
-			return Messages.KillableExecution_FinishStatus_WindowSizeChange;
-		case SIGIO:
-			return Messages.KillableExecution_FinishStatus_IOPossible;
-		case SIGPWR:
-			return Messages.KillableExecution_FinishStatus_PowerFailureRestart;
-		default:
-			return Messages.KillableExecution_FinishStatus_Unknown;
-		}
-	}
-
-	public boolean isException(int status) {
-		return (status >= 129) && (status <= 158);
-	}
-
-	public boolean isOK(int status) {
-		return status <= 125;
-	}
-
-	public boolean isExecutableError(int status) {
-		return (status >= 126) && (status <= 128);
-	}
-
-	public boolean wasException() {
-		return isException(getReturnCode());
-	}
-
-	public boolean wasOK() {
-		return isOK(getReturnCode());
-	}
-
-	public boolean wasCommandError() {
-		return isExecutableError(getReturnCode());
-	}
-
-	public static final int UNKNOWN = 0;
-	public static final int SUCCESS_OK = 1;
-	public static final int SUCCESS_ERROR = 2;
-	public static final int ERROR_NOT_EXECUTABLE = 126;
-	public static final int ERROR_NOT_FOUND = 127;
-	public static final int INVALID_EXIT_CODE = 128;
-	public static final int SIGHUP = 129;
-	public static final int SIGINT = 130;
-	public static final int SIGQUIT = 131;
-	public static final int SIGILL = 132;
-	public static final int SIGTRAP = 133;
-	public static final int SIGIOT = 134;
-	public static final int SIGBUS = 135;
-	public static final int SIGFPE = 136;
-	public static final int SIGKILL = 137;
-	public static final int SIGUSR1 = 138;
-	public static final int SIGSEGV = 139;
-	public static final int SIGUSR2 = 140;
-	public static final int SIGPIPE = 141;
-	public static final int SIGALRM = 142;
-	public static final int SIGTERM = 143;
-	public static final int SIGSTKFLT = 144;
-	public static final int SIGCHLD = 145;
-	public static final int SIGCONT = 146;
-	public static final int SIGSTOP = 147;
-	public static final int SIGTSTP = 148;
-	public static final int SIGTTIN = 149;
-	public static final int SIGTTOU = 150;
-	public static final int SIGURG = 151;
-	public static final int SIGXCPU = 152;
-	public static final int SIGXFSZ = 153;
-	public static final int SIGVTALRM = 154;
-	public static final int SIGPROF = 155;
-	public static final int SIGWINCH = 156;
-	public static final int SIGIO = 157;
-	public static final int SIGPWR = 158;
-
-}
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/PathTools.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/PathTools.java
deleted file mode 100755
index dd7680e..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/PathTools.java
+++ /dev/null

@@ -1,343 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.awt.geom.IllegalPathStateException;
-import java.text.CharacterIterator;
-import java.text.StringCharacterIterator;
-
-import org.eclipse.ptp.remotetools.core.IRemotePathTools;
-import org.eclipse.ptp.remotetools.core.messages.Messages;
-
-
-public class PathTools implements IRemotePathTools {
-	private static final String rootPath = "/"; //$NON-NLS-1$
-	ExecutionManager executionManager;
-	
-	public PathTools(ExecutionManager manager) {
-		this.executionManager = manager;
-	}
-
-	public String rootPath() {
-		return new String(rootPath);
-	}
-
-	public boolean isRoot(String path) {
-		if (path == null) throw new IllegalPathStateException();
-		return path.equals(rootPath);
-	}
-
-	public boolean isAbsolute(String path) {
-		if (path == null) throw new IllegalPathStateException();
-		return path.startsWith("/"); //$NON-NLS-1$
-	}
-
-	public boolean isRelative(String path) {
-		if (path == null) throw new IllegalPathStateException();
-		return ! path.startsWith("/"); //$NON-NLS-1$
-	}
-	
-	public boolean isLeave(String path) {
-		if (path == null) throw new IllegalPathStateException();
-		return ! (isRoot(path) || path.endsWith("/")); //$NON-NLS-1$
-	}
-	
-	public String leave(String path) {
-		if (path == null) throw new IllegalPathStateException();
-		if (isRoot(path)) return rootPath();
-		if (isLeave(path)) {
-			return path.substring(0, path.length()-1);
-		} else {
-			return new String(path);
-		}
-	}
-
-	public String canonicalize(String path) {
-		/*
-		 * Remove "." (current directory)
-		 * Remove "a/.." (parent directory)
-		 * Remove "//" (empty directory)
-		 */
-		if (path == null) throw new IllegalPathStateException();
-		if (isRoot(path)) return rootPath();
-		
-		/*
-		 * Split the path an remeber properties.
-		 */
-		String segments[] = split(path);
-		boolean absolute = isAbsolute(path);
-		boolean leave = isLeave(path);
-		
-		return canonicalize(segments, absolute, leave);
-	}
-		
-	private String canonicalize(String segments[], boolean absolute, boolean leave) {
-		int lastPosition = 0;
-		int currentPosition = 0;
-		int currentSize = segments.length;
-		while (currentPosition < segments.length) {
-			String segment = segments[currentPosition];
-			if (segment.equals(".") || segment.equals("")) { //$NON-NLS-1$ //$NON-NLS-2$
-				// Skip segment
-				currentPosition++;
-				continue;
-			} else if (segment.equals("..")) { //$NON-NLS-1$
-				if (lastPosition == 0) {
-					if (absolute) {
-						// Ignore, the parent of the root is the root itself.
-						currentPosition++;				
-					} else {
-						// Keep, since the path is relative.
-						if (currentPosition > lastPosition) {
-							segments[lastPosition] = segments[currentPosition];
-						}
-						lastPosition++;
-						currentPosition++;				
-					}
-				} else {
-					// Remove the segment and the parent, if the parent is not already ".."
-					String segment2 = segments[lastPosition-1];
-					if (segment2.equals("..")) { //$NON-NLS-1$
-						// Keep
-						if (currentPosition > lastPosition) {
-							segments[lastPosition] = segments[currentPosition];
-						}
-						lastPosition++;
-						currentPosition++;				
-					} else {
-						// Remove parent
-						lastPosition--;
-						currentPosition++;
-					}
-				}
-			} else {
-				// Keep
-				if (currentPosition > lastPosition) {
-					segments[lastPosition] = segments[currentPosition];
-				}
-				lastPosition++;
-				currentPosition++;
-			}
-		}
-		currentSize = lastPosition;
-				
-		/*
-		 * Rebuild the path as a string.
-		 */
-		return unsplit(segments, 0, currentSize-1, absolute, leave);
-	}
-	
-	public String join(String base, String path) {
-		if (base == null) throw new IllegalPathStateException();
-		if (path == null) throw new IllegalPathStateException();
-		if (isAbsolute(path)) return canonicalize(path);
-		String s1[] = split(base);
-		String s2[] = split(path);
-		String s[] = new String[s1.length + s2.length];
-		System.arraycopy(s1, 0, s, 0, s1.length);
-		System.arraycopy(s2, 0, s, s1.length, s2.length);
-		boolean absolute = isAbsolute(base);
-		boolean leave = isLeave(path);
-		return canonicalize(s,absolute,leave);
-	}
-	
-	public String parent(String path) {
-		if (path == null) throw new IllegalPathStateException();
-		if (isRoot(path)) return rootPath();
-		return join(path, ".."); //$NON-NLS-1$
-	}
-	
-	private String [] split (String path) {
-		if (isRoot(path)) {
-			return new String[0];
-		}
-		int start = 0;
-		int end = path.length();
-		if (isAbsolute(path)) {
-			// Ignore trailing "/"
-			start++;
-		}
-		if (! isLeave(path)) {
-			// Ignore ending "/"
-			end--;
-		}
-		return path.substring(start, end).split("/"); //$NON-NLS-1$
-	}
-
-	private String unsplit(String[] segments, int start, int end, boolean absolute, boolean leave) {
-		String result = null;
-		int segmentCount = end-start+1;
-		if (segmentCount <= 0) {
-			if (absolute) {
-				return rootPath;
-			} else {
-				return ""; //$NON-NLS-1$
-			}
-		}
-		if (absolute) {
-			result = "/"; //$NON-NLS-1$
-		} else {
-			result = ""; //$NON-NLS-1$
-		}
-		for (int i = start; i <= end; i++) {
-			if (i != start) {
-				result += "/"; //$NON-NLS-1$
-			}
-			result += segments[i];
-		}
-		if (! leave) {
-			if (segmentCount > 0) {
-				result += "/"; //$NON-NLS-1$
-			}
-		}
-		return result;
-	}
-	
-	public String quote(String path, boolean full) {
-		StringBuffer buffer = new StringBuffer();
-		StringCharacterIterator iter = new StringCharacterIterator(path);
-		for (char c = iter.first(); c != CharacterIterator.DONE; c = iter.next()) {
-			switch (c) {
-			case '(':
-			case ')':
-			case '[':
-			case ']':
-			case '{':
-			case '}':
-			case '|':
-			case '\\':
-			case '*':
-			case '&':
-			case '^':
-			case '%':
-			case '$':
-			case '#':
-			case '@':
-			case '!':
-			case '~':
-			case '`':
-			case '\'':
-			case '"':
-			case ':':
-			case ';':
-			case '?':
-			case '<':
-			case '>':
-			case ',':
-			case '\n':
-				if (full) {
-					buffer.append('\\');
-				}
-				buffer.append(c);
-				continue;
-			case ' ':
-				buffer.append('\\');
-				buffer.append(c);
-				continue;
-			default:
-				buffer.append(c);
-				continue;
-			}
-		}
-		return buffer.toString();
-	}
-
-	public static void main(String[] args) {
-		IRemotePathTools tools = new PathTools(null);
-		System.out.println(tools.rootPath());
-		System.out.println();
-		System.out.println(tools.isRoot("/")); //$NON-NLS-1$
-		System.out.println(tools.isRoot("/a")); //$NON-NLS-1$
-		System.out.println(tools.isRoot("/a/")); //$NON-NLS-1$
-		System.out.println(tools.isRoot("a")); //$NON-NLS-1$
-		System.out.println();
-		System.out.println(tools.isAbsolute("/")); //$NON-NLS-1$
-		System.out.println(tools.isAbsolute("/a")); //$NON-NLS-1$
-		System.out.println(tools.isAbsolute("/a/")); //$NON-NLS-1$
-		System.out.println(tools.isAbsolute("a")); //$NON-NLS-1$
-		System.out.println();
-		System.out.println(tools.isRelative("/")); //$NON-NLS-1$
-		System.out.println(tools.isRelative("/a")); //$NON-NLS-1$
-		System.out.println(tools.isRelative("/a/")); //$NON-NLS-1$
-		System.out.println(tools.isRelative("a")); //$NON-NLS-1$
-		System.out.println();
-		System.out.println(tools.isLeave("/")); //$NON-NLS-1$
-		System.out.println(tools.isLeave("/a")); //$NON-NLS-1$
-		System.out.println(tools.isLeave("/a/")); //$NON-NLS-1$
-		System.out.println(tools.isLeave("a")); //$NON-NLS-1$
-		System.out.println();
-		System.out.println(tools.parent("/")); //$NON-NLS-1$
-		System.out.println(tools.parent("/a")); //$NON-NLS-1$
-		System.out.println(tools.parent("/a/b")); //$NON-NLS-1$
-		System.out.println(tools.parent("/a/")); //$NON-NLS-1$
-		System.out.println(tools.parent("/a/.")); //$NON-NLS-1$
-		System.out.println(tools.parent("/a/..")); //$NON-NLS-1$
-		System.out.println(tools.parent("/a//")); //$NON-NLS-1$
-		System.out.println(tools.parent("/a/b/")); //$NON-NLS-1$
-		System.out.println(tools.parent("/a/b/.")); //$NON-NLS-1$
-		System.out.println(tools.parent("/a/b/..")); //$NON-NLS-1$
-		System.out.println(tools.parent("/a/b//")); //$NON-NLS-1$
-		System.out.println(tools.parent("/..")); //$NON-NLS-1$
-		System.out.println(tools.parent("/.")); //$NON-NLS-1$
-		System.out.println();
-		System.out.println(tools.parent("")); //$NON-NLS-1$
-		System.out.println(tools.parent("a")); //$NON-NLS-1$
-		System.out.println(tools.parent("a/b")); //$NON-NLS-1$
-		System.out.println(tools.parent(Messages.PathTools_47));
-		System.out.println(tools.parent("a/.")); //$NON-NLS-1$
-		System.out.println(tools.parent("a/..")); //$NON-NLS-1$
-		System.out.println(tools.parent("a//")); //$NON-NLS-1$
-		System.out.println(tools.parent("a/b/")); //$NON-NLS-1$
-		System.out.println(tools.parent("a/b/.")); //$NON-NLS-1$
-		System.out.println(tools.parent("a/b/..")); //$NON-NLS-1$
-		System.out.println(tools.parent("a/b//")); //$NON-NLS-1$
-		System.out.println(tools.parent("..")); //$NON-NLS-1$
-		System.out.println(tools.parent(".")); //$NON-NLS-1$
-		System.out.println();
-		System.out.println(tools.join("b", "a")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("b", "/a")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("b", "..")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("b", ".")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("b", "")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("b", "/")); //$NON-NLS-1$ //$NON-NLS-2$
-
-		System.out.println(tools.join("b/", "a")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("b/", "/a")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("b/", "..")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("b/", ".")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("b/", "")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("b/", "/")); //$NON-NLS-1$ //$NON-NLS-2$
-
-		System.out.println(tools.join(".", "a")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join(".", "/a")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join(".", "..")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join(".", ".")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join(".", "")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join(".", "/")); //$NON-NLS-1$ //$NON-NLS-2$
-
-		System.out.println(tools.join("..", "a")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("..", "/a")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("..", "..")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("..", ".")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("..", "")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("..", "/")); //$NON-NLS-1$ //$NON-NLS-2$
-
-		System.out.println(tools.join("", "a")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("", "/a")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("", "..")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("", ".")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("", "")); //$NON-NLS-1$ //$NON-NLS-2$
-		System.out.println(tools.join("", "/")); //$NON-NLS-1$ //$NON-NLS-2$
-
-	}
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/PortForwardingTools.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/PortForwardingTools.java
deleted file mode 100644
index ff3b301..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/PortForwardingTools.java
+++ /dev/null

@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import org.eclipse.ptp.remotetools.core.IPortForwarding;
-import org.eclipse.ptp.remotetools.core.IRemotePortForwarding;
-import org.eclipse.ptp.remotetools.core.IRemotePortForwardingTools;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.PortForwardingException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-
-/**
- * Implementation of {@link IRemotePortForwardingTools} for SSH. It simply
- * redirects requests to the {@link RemotePortForwardingPool} managed by the
- * {@link Connection}, but filtering the forwardings for the execution manager.
- * 
- * @author Daniel Felix Ferber
- */
-public class PortForwardingTools implements IRemotePortForwardingTools {
-	ExecutionManager executionManager;
-
-	PortForwardingTools(ExecutionManager executionManager) {
-		this.executionManager = executionManager;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemotePortForwardingTools#forwardRemotePort
-	 * (int, int)
-	 */
-	public IRemotePortForwarding forwardRemotePort(int remotePort, int localPort)
-			throws RemoteConnectionException, PortForwardingException,
-			CancelException {
-		this.executionManager.test();
-		this.executionManager.testCancel();
-
-		RemotePortForwarding forwarding = this.executionManager.connection
-				.getForwardingPool().createRemotePortForwarding(
-						this.executionManager, remotePort, null, localPort);
-		return forwarding;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemotePortForwardingTools#forwardRemotePort
-	 * (int, java.lang.String, int)
-	 */
-	public IRemotePortForwarding forwardRemotePort(int remotePort,
-			String localAddress, int localPort)
-			throws RemoteConnectionException, PortForwardingException,
-			CancelException {
-		this.executionManager.test();
-		this.executionManager.testCancel();
-
-		RemotePortForwarding forwarding = this.executionManager.connection
-				.getForwardingPool().createRemotePortForwarding(
-						this.executionManager, remotePort, localAddress,
-						localPort);
-		return forwarding;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @seeorg.eclipse.ptp.remotetools.core.IRemotePortForwardingTools#
-	 * getRemotePortForwarding(int)
-	 */
-	public IRemotePortForwarding getRemotePortForwarding(int remotePort)
-			throws RemoteConnectionException, PortForwardingException {
-		this.executionManager.test();
-
-		RemotePortForwarding forwarding = this.executionManager.connection
-				.getForwardingPool().getRemotePortForwarding(remotePort);
-
-		/* Return null if there is no forwarding for the remote port. */
-		if (forwarding == null) {
-			return null;
-		}
-
-		/*
-		 * Return null if there is forwarding for the remote port, but it does
-		 * not belong the the ExecutionManager.
-		 */
-		if (forwarding.owner != this.executionManager) {
-			return null;
-		}
-
-		return forwarding;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remotetools.core.IRemotePortForwardingTools#releaseForwarding
-	 * (org.eclipse.ptp.remotetools.core.IPortForwarding)
-	 */
-	public void releaseForwarding(IPortForwarding forwarding)
-			throws RemoteConnectionException, PortForwardingException {
-		assert forwarding != null;
-		this.executionManager.test();
-
-		if (forwarding instanceof RemotePortForwarding) {
-			this.executionManager.connection.getForwardingPool()
-					.releaseRemotePortForwarding(
-							(RemotePortForwarding) forwarding,
-							this.executionManager);
-		} else {
-			/* Forwarding is not a valid instance. */
-			assert false;
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RegexFileNameFilter.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RegexFileNameFilter.java
deleted file mode 100755
index 416c054..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RegexFileNameFilter.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-class RegexFileNameFilter implements FilenameFilter {
-	Pattern pattern;
-	Matcher matcher;
-	RegexFileNameFilter(String regex) {
-		this.pattern = Pattern.compile(regex);
-	}
-	public boolean accept(File dir, String name) {
-		this.matcher = pattern.matcher(name);			
-		return matcher.matches();
-	}
-}
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteFileAttributes.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteFileAttributes.java
deleted file mode 100644
index 4391d06..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteFileAttributes.java
+++ /dev/null

@@ -1,299 +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.remotetools.internal.ssh;
-
-import java.util.Date;
-
-import com.ibm.icu.text.SimpleDateFormat;
-import com.jcraft.jsch.Buffer;
-import com.jcraft.jsch.SftpATTRS;
-
-public class RemoteFileAttributes {
-	static final int S_ISUID = 04000; // set user ID on execution
-	static final int S_ISGID = 02000; // set group ID on execution
-	static final int S_ISVTX = 01000; // sticky bit ****** NOT DOCUMENTED *****
-
-	static final int S_IRUSR = 00400; // read by owner
-	static final int S_IWUSR = 00200; // write by owner
-	static final int S_IXUSR = 00100; // execute/search by owner
-	static final int S_IREAD = 00400; // read by owner
-	static final int S_IWRITE = 00200; // write by owner
-	static final int S_IEXEC = 00100; // execute/search by owner
-
-	static final int S_IRGRP = 00040; // read by group
-	static final int S_IWGRP = 00020; // write by group
-	static final int S_IXGRP = 00010; // execute/search by group
-
-	static final int S_IROTH = 00004; // read by others
-	static final int S_IWOTH = 00002; // write by others
-	static final int S_IXOTH = 00001; // execute/search by others
-
-	private static final int pmask = 0xFFF;
-
-	public String getPermissionsString() {
-		StringBuffer buf = new StringBuffer(10);
-
-		if (isDir())
-			buf.append('d');
-		else if (isLink())
-			buf.append('l');
-		else
-			buf.append('-');
-
-		if ((permissions & S_IRUSR) != 0)
-			buf.append('r');
-		else
-			buf.append('-');
-
-		if ((permissions & S_IWUSR) != 0)
-			buf.append('w');
-		else
-			buf.append('-');
-
-		if ((permissions & S_ISUID) != 0)
-			buf.append('s');
-		else if ((permissions & S_IXUSR) != 0)
-			buf.append('x');
-		else
-			buf.append('-');
-
-		if ((permissions & S_IRGRP) != 0)
-			buf.append('r');
-		else
-			buf.append('-');
-
-		if ((permissions & S_IWGRP) != 0)
-			buf.append('w');
-		else
-			buf.append('-');
-
-		if ((permissions & S_ISGID) != 0)
-			buf.append('s');
-		else if ((permissions & S_IXGRP) != 0)
-			buf.append('x');
-		else
-			buf.append('-');
-
-		if ((permissions & S_IROTH) != 0)
-			buf.append('r');
-		else
-			buf.append('-');
-
-		if ((permissions & S_IWOTH) != 0)
-			buf.append('w');
-		else
-			buf.append('-');
-
-		if ((permissions & S_IXOTH) != 0)
-			buf.append('x');
-		else
-			buf.append('-');
-		return (buf.toString());
-	}
-
-	public String getAtimeString() {
-		SimpleDateFormat locale = new SimpleDateFormat();
-		return (locale.format(new Date(atime)));
-	}
-
-	public String getMtimeString() {
-		Date date = new Date(((long) mtime) * 1000);
-		return (date.toString());
-	}
-
-	public static final int SSH_FILEXFER_ATTR_SIZE = 0x00000001;
-	public static final int SSH_FILEXFER_ATTR_UIDGID = 0x00000002;
-	public static final int SSH_FILEXFER_ATTR_PERMISSIONS = 0x00000004;
-	public static final int SSH_FILEXFER_ATTR_ACMODTIME = 0x00000008;
-	public static final int SSH_FILEXFER_ATTR_EXTENDED = 0x80000000;
-
-	static final int S_IFDIR = 0x4000;
-	static final int S_IFLNK = 0xa000;
-
-	int flags = 0;
-	long size;
-	int uid;
-	int gid;
-	int permissions;
-	int atime;
-	int mtime;
-	String[] extended = null;
-
-	public RemoteFileAttributes() {
-	}
-
-	public RemoteFileAttributes(SftpATTRS attrs) {
-		flags = attrs.getFlags();
-		permissions = attrs.getPermissions();
-		size = attrs.getSize();
-		uid = attrs.getUId();
-		gid = attrs.getGId();
-		mtime = attrs.getMTime();
-		atime = attrs.getATime();
-		extended = attrs.getExtended();
-	}
-
-	public static RemoteFileAttributes getAttributes(SftpATTRS attrs) {
-		return new RemoteFileAttributes(attrs);
-	}
-
-	public static RemoteFileAttributes getAttributes(String buf) {
-		RemoteFileAttributes attr = new RemoteFileAttributes();
-
-		if (buf.endsWith("No such file or directory")) { //$NON-NLS-1$
-			return null;
-		}
-		String[] args = buf.split(" "); //$NON-NLS-1$
-		if (args.length != 6) {
-			return null;
-		}
-
-		attr.flags = SSH_FILEXFER_ATTR_PERMISSIONS | SSH_FILEXFER_ATTR_SIZE | SSH_FILEXFER_ATTR_UIDGID
-				| SSH_FILEXFER_ATTR_ACMODTIME;
-
-		attr.permissions = Integer.decode(args[0]);
-		attr.size = Long.parseLong(args[1]);
-		attr.uid = Integer.parseInt(args[2]);
-		attr.gid = Integer.parseInt(args[3]);
-		attr.mtime = Integer.parseInt(args[4]);
-		attr.atime = Integer.parseInt(args[5]);
-		return attr;
-	}
-
-	int length() {
-		int len = 4;
-
-		if ((flags & SSH_FILEXFER_ATTR_SIZE) != 0) {
-			len += 8;
-		}
-		if ((flags & SSH_FILEXFER_ATTR_UIDGID) != 0) {
-			len += 8;
-		}
-		if ((flags & SSH_FILEXFER_ATTR_PERMISSIONS) != 0) {
-			len += 4;
-		}
-		if ((flags & SSH_FILEXFER_ATTR_ACMODTIME) != 0) {
-			len += 8;
-		}
-		if ((flags & SSH_FILEXFER_ATTR_EXTENDED) != 0) {
-			len += 4;
-			int count = extended.length / 2;
-			if (count > 0) {
-				for (int i = 0; i < count; i++) {
-					len += 4;
-					len += extended[i * 2].length();
-					len += 4;
-					len += extended[i * 2 + 1].length();
-				}
-			}
-		}
-		return len;
-	}
-
-	void dump(Buffer buf) {
-		buf.putInt(flags);
-		if ((flags & SSH_FILEXFER_ATTR_SIZE) != 0) {
-			buf.putLong(size);
-		}
-		if ((flags & SSH_FILEXFER_ATTR_UIDGID) != 0) {
-			buf.putInt(uid);
-			buf.putInt(gid);
-		}
-		if ((flags & SSH_FILEXFER_ATTR_PERMISSIONS) != 0) {
-			buf.putInt(permissions);
-		}
-		if ((flags & SSH_FILEXFER_ATTR_ACMODTIME) != 0) {
-			buf.putInt(atime);
-		}
-		if ((flags & SSH_FILEXFER_ATTR_ACMODTIME) != 0) {
-			buf.putInt(mtime);
-		}
-		if ((flags & SSH_FILEXFER_ATTR_EXTENDED) != 0) {
-			int count = extended.length / 2;
-			if (count > 0) {
-				for (int i = 0; i < count; i++) {
-					buf.putString(extended[i * 2].getBytes());
-					buf.putString(extended[i * 2 + 1].getBytes());
-				}
-			}
-		}
-	}
-
-	void setFLAGS(int flags) {
-		this.flags = flags;
-	}
-
-	public void setSIZE(long size) {
-		flags |= SSH_FILEXFER_ATTR_SIZE;
-		this.size = size;
-	}
-
-	public void setUIDGID(int uid, int gid) {
-		flags |= SSH_FILEXFER_ATTR_UIDGID;
-		this.uid = uid;
-		this.gid = gid;
-	}
-
-	public void setACMODTIME(int atime, int mtime) {
-		flags |= SSH_FILEXFER_ATTR_ACMODTIME;
-		this.atime = atime;
-		this.mtime = mtime;
-	}
-
-	public void setPERMISSIONS(int permissions) {
-		flags |= SSH_FILEXFER_ATTR_PERMISSIONS;
-		permissions = (this.permissions & ~pmask) | (permissions & pmask);
-		this.permissions = permissions;
-	}
-
-	public boolean isDir() {
-		return ((flags & SSH_FILEXFER_ATTR_PERMISSIONS) != 0 && ((permissions & S_IFDIR) == S_IFDIR));
-	}
-
-	public boolean isLink() {
-		return ((flags & SSH_FILEXFER_ATTR_PERMISSIONS) != 0 && ((permissions & S_IFLNK) == S_IFLNK));
-	}
-
-	public int getFlags() {
-		return flags;
-	}
-
-	public long getSize() {
-		return size;
-	}
-
-	public int getUId() {
-		return uid;
-	}
-
-	public int getGId() {
-		return gid;
-	}
-
-	public int getPermissions() {
-		return permissions;
-	}
-
-	public int getATime() {
-		return atime;
-	}
-
-	public int getMTime() {
-		return mtime;
-	}
-
-	public String[] getExtended() {
-		return extended;
-	}
-
-	@Override
-	public String toString() {
-		return getPermissionsString() + " " + getUId() + " " + getGId() + " " + getSize() + " " + getMtimeString(); //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteFileEnumeration.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteFileEnumeration.java
deleted file mode 100755
index 2608355..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteFileEnumeration.java
+++ /dev/null

@@ -1,98 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 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 Implementation
- *     Roland Schulz, University of Tennessee
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.util.NoSuchElementException;
-
-import org.eclipse.ptp.remotetools.core.IRemoteFileEnumeration;
-import org.eclipse.ptp.remotetools.core.IRemoteItem;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-
-
-/**
- * Enumeration of files on the remote host.
- * The enumeration stops when:
- * <ul>
- * <li>All files have been enumerated.
- * <li>The execution manager gets canceled.
- * <li>The connection fails
- * </ul>
- * If an element fails to be retrieved, an exception is returned instead of the element.
- * 
- * Instead of {@link #nextElement()}, one may call {@link #nextRemoteItem()}.
- * 
- * @author Daniel Ferber
- */
-public class RemoteFileEnumeration implements IRemoteFileEnumeration {
-
-	private IRemoteItem[] items = null;
-	private int currentItem = 0;
-	
-	/**
-	 * Enumerates all files on a given root directory.
-	 * 
-	 * @param fileTools
-	 * @param directoryPath The remote directory. Must be a valid existing directory.
-	 * @throws RemoteOperationException
-	 * @throws RemoteConnectionException The root directory does not exist or is not a directory.
-	 * @throws CancelException
-	 */
-	public RemoteFileEnumeration(FileTools fileTools, String directoryPath) throws RemoteOperationException, RemoteConnectionException, CancelException {
-		// don't need, listItems(root) will test
-		// fileTools.test();
-
-		this.items = fileTools.listItems(directoryPath, null);
-		this.currentItem = 0;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.util.Enumeration#hasMoreElements()
-	 */
-	public boolean hasMoreElements() {
-		return currentItem < items.length;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteFileEnumeration#hasMoreExceptions()
-	 */
-	public boolean hasMoreExceptions() {
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.util.Enumeration#nextElement()
-	 */
-	public IRemoteItem nextElement() {
-		return nextElementAsItem();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteFileEnumeration#nextElementAsItem()
-	 */
-	public IRemoteItem nextElementAsItem() {
-		if (currentItem >= items.length) {
-			throw new NoSuchElementException();
-		}
-		return items[currentItem++];
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteFileEnumeration#nextException()
-	 */
-	public Exception nextException() {
-		return null; // always null
-	}
-}
-

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteFileRecursiveEnumeration.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteFileRecursiveEnumeration.java
deleted file mode 100755
index 23ed71c..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteFileRecursiveEnumeration.java
+++ /dev/null

@@ -1,124 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.util.LinkedList;
-import java.util.NoSuchElementException;
-import java.util.Stack;
-
-import org.eclipse.ptp.remotetools.core.IRemoteFileEnumeration;
-import org.eclipse.ptp.remotetools.core.IRemoteItem;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-
-
-
-public class RemoteFileRecursiveEnumeration implements IRemoteFileEnumeration {
-
-	private Stack<String> directories;
-	private RemoteFileEnumeration currentItems;
-	private FileTools fileTools;
-	private LinkedList<Exception> currentExceptions = new LinkedList<Exception>();
-	private IRemoteItem nextRemoteItem;
-	
-	public RemoteFileRecursiveEnumeration(FileTools fileTools, String root) throws RemoteOperationException, RemoteConnectionException, CancelException {
-		this.fileTools = fileTools;
-		// dont need, getItem(root) will test
-		// fileTools.test();
-		directories = new Stack<String>();
-		directories.add(root);
-		prefetchNextRemoteItem();
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.util.Enumeration#hasMoreElements()
-	 */
-	public boolean hasMoreElements() {
-		return nextRemoteItem != null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteFileEnumeration#hasMoreExceptions()
-	 */
-	public boolean hasMoreExceptions() {
-		return currentExceptions.size() > 0;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.util.Enumeration#nextElement()
-	 */
-	public IRemoteItem nextElement() {
-		return nextElementAsItem();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteFileEnumeration#nextElementAsItem()
-	 */
-	public IRemoteItem nextElementAsItem() {
-		if (nextRemoteItem == null) {
-			throw new NoSuchElementException();
-		}
-		IRemoteItem returnItem = nextRemoteItem;
-		prefetchNextRemoteItem();
-		return returnItem;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteFileEnumeration#nextException()
-	 */
-	public Exception nextException() {
-		if (currentExceptions.size() == 0) {
-			return null;
-		}
-		return (Exception) currentExceptions.removeFirst();
-	}
-
-	private void prefetchNextRemoteItem() {
-		if (directories == null) {
-			// Enumeration stopped due to error.
-			nextRemoteItem = null;
-			return;
-		}
-		
-		nextRemoteItem = null;
-		while (currentItems == null || ! currentItems.hasMoreElements()) {
-			if (directories.empty()) {
-				// No more directories are in stack. Terminate without any item.
-				return;
-			}
-			String root = (String)directories.pop();
-			try {
-				currentItems = new RemoteFileEnumeration(fileTools, root);
-			} catch (CancelException e) {
-				currentExceptions.clear();
-				currentExceptions.addLast(e);
-				return;
-			} catch (RemoteConnectionException e) {
-				currentExceptions.clear();
-				currentExceptions.addLast(e);
-				return;
-			} catch (RemoteOperationException e) {
-				currentExceptions.addLast(e);
-				continue;
-			}
-		}
-			
-		IRemoteItem item = currentItems.nextElementAsItem();
-		if (item.isDirectory()) {
-			directories.add(item.getPath());
-		}
-		nextRemoteItem = item;
-	}
-	
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteItem.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteItem.java
deleted file mode 100755
index e3e67c2..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemoteItem.java
+++ /dev/null

@@ -1,347 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 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 Implementation
- *     Roland Schulz, University of Tennessee
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.util.Set;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.ptp.remotetools.core.IRemoteItem;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-
-import com.jcraft.jsch.SftpATTRS;
-
-/**
- * @author Richard Maciel
- *
- */
-class RemoteItem implements IRemoteItem {
-
-	protected String path;
-	protected boolean isReadable;
-	protected boolean isWritable;
-	protected boolean isExecutable;
-	protected boolean exist;
-	protected FileTools fileTools;
-	protected int userID;
-	protected int permissions;
-	protected long size;
-	protected int accessTime;
-	protected int modificationTime;
-	protected int groupID;
-	protected int changes;
-	protected boolean isDirectory;
-	
-	protected final int PERMISSION = 1;
-	protected final int MODIFICATION_TIME = 2;
-	
-	protected RemoteItem() {
-	}
-	
-	RemoteItem(FileTools fileTools, String path)	{
-		this.fileTools = fileTools;
-		this.path = path;
-	}
-	
-	RemoteItem(FileTools fileTools, String path, SftpATTRS attrs) {
-		this.fileTools = fileTools;
-		this.path = path;
-		
-		RemoteFileAttributes remoteAttrs = new RemoteFileAttributes(attrs);
-		parseAttrs(remoteAttrs);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteItem#commitAttributes()
-	 */
-	public void commitAttributes(IProgressMonitor monitor) throws RemoteConnectionException, CancelException, RemoteOperationException {
-		fileTools.test();
-		if ((changes & PERMISSION) != 0) {
-			fileTools.chmod(permissions, path, monitor);
-			changes &= ~PERMISSION;
-		}
-		if ((changes & MODIFICATION_TIME) != 0) {
-			fileTools.setMtime(path, modificationTime, monitor);
-			changes &= ~MODIFICATION_TIME;
-		}
-//		changes = 0;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteItem#exists()
-	 */
-	public boolean exists() {
-		return exist;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteItem#getAccessTime()
-	 */
-	public long getAccessTime() {
-		return (long)accessTime*1000;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteItem#getModificationTime()
-	 */
-	public long getModificationTime() {
-		return (long)modificationTime*1000;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteItemProperties#getPathname()
-	 */
-	public String getPath() {
-		return path;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteItem#getSize()
-	 */
-	public long getSize() {
-		return size;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteItem#isDirectory()
-	 */
-	public boolean isDirectory() {
-		return isDirectory;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteItem#isExecutable()
-	 */
-	public boolean isExecutable() {
-		return isExecutable;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteItemProperties#isReadableByUser()
-	 */
-	public boolean isReadable() {
-		return isReadable;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteItemProperties#isWritableByUser()
-	 */
-	public boolean isWritable() {
-		return isWritable;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteItem#refreshAttributes()
-	 */
-	public void refreshAttributes(IProgressMonitor monitor) throws RemoteConnectionException, RemoteOperationException, CancelException {
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-		fileTools.test();
-		RemoteFileAttributes attrs = fileTools.fetchRemoteAttr(path, monitor);
-		parseAttrs(attrs);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteItem#setExecutable(boolean)
-	 */
-	public void setExecutable(boolean flag) {
-		int oldPermissions = permissions;
-		if (userID == fileTools.getCachedUserID()) {
-			if (flag) {
-				permissions |= 0100;
-			} else {
-				permissions &= ~0100;
-			}
-		}
-		if(fileTools.getCachedGroupIDSet().contains(new Integer(groupID))) {
-			if (flag) {
-				permissions |= 0010;
-			} else {
-				permissions &= ~0010;
-			}
-		}
-		if (flag) {
-			permissions |= 0001;
-		} else {
-			permissions &= ~0001;
-		}
-		if (oldPermissions != permissions) {
-			changes |= PERMISSION;
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteItem#setModificationTime(long)
-	 */
-	public void setModificationTime(long time) {
-		int oldModificationTime = modificationTime;
-		modificationTime = (int)(time/1000);
-		if (oldModificationTime != modificationTime) {
-			changes |= MODIFICATION_TIME;
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteItem#setReadable(boolean)
-	 */
-	public void setReadable(boolean flag) {
-		int oldPermissions = permissions;
-		if (userID == fileTools.getCachedUserID()) {
-			if (flag) {
-				permissions |= 0400;
-			} else {
-				permissions &= ~0400;
-			}
-		}
-		Set<Integer> groupIDSet = fileTools.getCachedGroupIDSet();
-		if(groupIDSet.contains(new Integer(groupID))) {
-			if (flag) {
-				permissions |= 0040;
-			} else {
-				permissions &= ~0040;
-			}
-		}
-		if (flag) {
-			permissions |= 0004;
-		} else {
-			permissions &= ~0004;
-		}
-		if (oldPermissions != permissions) {
-			changes |= PERMISSION;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteItem#setWriteable(boolean)
-	 */
-	public void setWriteable(boolean flag) {
-		int oldPermissions = permissions;
-		if (userID == fileTools.getCachedUserID()) {
-			if (flag) {
-				permissions |= 0200;
-			} else {
-				permissions &= ~0200;
-			}
-		}
-		Set<Integer> groupIDSet = fileTools.getCachedGroupIDSet();
-		if(groupIDSet.contains(new Integer(groupID))) {
-			if (flag) {
-				permissions |= 0020;
-			} else {
-				permissions &= ~0020;
-			}
-		}
-		if (flag) {
-			permissions |= 0002;
-		} else {
-			permissions &= ~0002;
-		}
-		if (oldPermissions != permissions) {
-			changes |= PERMISSION;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		if (exist) {
-			return path + (isDirectory ? "(d)" : "(f)"); //$NON-NLS-1$ //$NON-NLS-2$
-		} else {
-			return path + " does not exist"; //$NON-NLS-1$
-		}
-	}
-
-	private void parseAttrs(RemoteFileAttributes attrs) {
-		/*
-		 * No file found.
-		 */
-		if (attrs == null) {
-			exist = false;
-			return;
-		} 
-		
-		exist = true;
-		changes = 0;
-
-		assert(isDirectory == attrs.isDir());
-		isDirectory = attrs.isDir();
-		
-		userID = attrs.getUId();
-		groupID = attrs.getGId();
-		permissions = attrs.getPermissions();
-		
-		isReadable = false;
-		isWritable = false;
-		isExecutable = false;
-		
-		if(userID == fileTools.getCachedUserID()) {
-			if ((permissions & 0400) != 0) {
-				isReadable = true;
-			}
-			if ((permissions & 0200) != 0) {
-				isWritable = true;
-			} 
-			if ((permissions & 0100) != 0) {
-				isExecutable = true;
-			}
-		} 
-				
-		Set<Integer> groupIDSet = fileTools.getCachedGroupIDSet();
-		if(groupIDSet.contains(new Integer(groupID))) {
-			if ((permissions & 0040) != 0) {
-				isReadable = true;
-			}
-			if ((permissions & 0020) != 0) {
-				isWritable = true;
-			} 
-			if ((permissions & 0010) != 0) {
-				isExecutable = true;
-			}
-		}
-			
-		if ((permissions & 0004) != 0) {
-			isReadable = true;
-		}
-		if ((permissions & 0002) != 0) {
-			isWritable = true;
-		} 
-		if ((permissions & 0001) != 0) {
-			isExecutable = true;
-		}
-		
-		size = attrs.getSize();
-		accessTime = attrs.getATime();
-		modificationTime = attrs.getMTime();
-	}
-	
-	protected void copyAttributesFrom(RemoteItem other) {
-		this.path = other.path;
-		this.isReadable = other.isReadable;
-		this.isWritable = other.isWritable;
-		this.isExecutable = other.isExecutable;
-		this.exist = other.exist;
-		this.fileTools = other.fileTools;
-		this.userID = other.userID;
-		this.permissions = other.permissions;
-		this.size = other.size;
-		this.accessTime = other.accessTime;
-		this.modificationTime = other.modificationTime;
-		this.groupID = other.groupID;
-		this.changes = other.changes;
-		this.isDirectory = other.isDirectory;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemotePortForwarding.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemotePortForwarding.java
deleted file mode 100644
index 528c1eb..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemotePortForwarding.java
+++ /dev/null

@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.remotetools.core.IRemotePortForwarding;
-import org.eclipse.ptp.remotetools.core.messages.Messages;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.PortForwardingException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-
-/**
- * Implementation of {@link IRemotePortForwarding} for SSH. Contains information
- * about from and to where the port forwarding was established. The information
- * is valid while the forwarding is active.
- * 
- * When creating the forwarding, the constructor assigns an execution manager as
- * owner of the port forwarding. When the port forwarding is turned off, then it
- * will is considered "inactive", it will have no execution manager anymore as
- * owner and the information won't be valid anymore.
- * The forwarding must be notified by that it was turned off by Remote Tools calling {@link #releaseOwner()}.
- * 
- * If the owner wasn't removed when turning off the connection, the an
- * application that stores a reference to the forwarding, would also indirectly
- * reference the execution manager, the connection and all data structure.
- * This would prevent garbage collection of connections that are not used anymore.
- * 
- * All methods have package visibility to allows internal access without getter/setters.
- * 
- * @author Daniel Felix Ferber
- * 
- */
-public class RemotePortForwarding implements IRemotePortForwarding {
-	/**
-	 * The execution manager that created and owns the port forwarding.
-	 * When <code>null</code>, signals that the forwarding was turned off and that the data is not valid anymore.
-	 */
-	ExecutionManager owner;
-	
-	/** The port on the host where the remote port is forwarded to. */
-	int localPort;
-	/** The host where the remote port is forwarded to. */
-	String localAddress;
-	/** The remote port that is being forwarded. */
-	int remotePort;
-	
-	/**
-	 * Creates a remote port forwarding that is owned by the execution manager.
-	 * <p>
-	 * Used by the SSH implementation of Remote Tools.
-	 * 
-	 * @param owner
-	 *            The execution manager that owns the port forwarding.
-	 * @param localPort
-	 *            The port on the host where the remote port is forwarded to.
-	 * @param localAddress
-	 *            The host where the remote port is forwarded to.
-	 * @param remotePort
-	 *            The remote port that is being forwarded.
-	 */
-	RemotePortForwarding(ExecutionManager owner, int localPort,
-			String localAddress, int remotePort) {
-		super();
-		this.owner = owner;
-		this.localPort = localPort;
-		this.localAddress = localAddress;
-		this.remotePort = remotePort;
-	}
-
-	/**
-	 * Notifies that the forwarding was turned off.
-	 * <p>
-	 * Used by the SSH implementation of Remote Tools.
-	 */
-	void releaseOwner() {
-		this.owner = null;
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemotePortForwarding#getLocalPort()
-	 */
-	public int getLocalPort() {
-		return localPort;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemotePortForwarding#getLocalAddress()
-	 */
-	public String getLocalAddress() {
-		return localAddress;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemotePortForwarding#getRemotePort()
-	 */
-	public int getRemotePort() {
-		return remotePort;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemotePortForwarding#release()
-	 */
-	public void release() throws RemoteConnectionException,
-			PortForwardingException, CancelException {
-		if (owner == null) {
-			throw new PortForwardingException(PortForwardingException.REMOTE_FORWARDING_NOT_ATIVE);
-		}
-		owner.getPortForwardingTools().releaseForwarding(this);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return NLS.bind(Messages.RemotePortForwarding_0, new Object[] { new Integer(remotePort), localAddress, new Integer(localPort)});
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IPortForwarding#isActive()
-	 */
-	public boolean isActive() {
-		return owner != null;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemotePortForwardingPool.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemotePortForwardingPool.java
deleted file mode 100644
index b863070..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/RemotePortForwardingPool.java
+++ /dev/null

@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.eclipse.ptp.remotetools.exception.PortForwardingException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-
-import com.jcraft.jsch.JSchException;
-
-/**
- * Keeps references to all active port forwardings of a connection. This
- * forwardings are shared by all execution managers, since it is a ressource
- * that applies only to the connection.
- * 
- * @author dfferber
- * 
- */
-public class RemotePortForwardingPool {
-	/**
-	 * Remote port to local forwarding that are active on the Connection.
-	 */
-	private final HashMap<Integer, RemotePortForwarding> remotePortForwardings = new HashMap<Integer, RemotePortForwarding>();;
-
-	/**
-	 * Connection
-	 */
-	private final Connection connection;
-
-	public RemotePortForwardingPool(Connection connection) {
-		assert connection != null;
-
-		this.connection = connection;
-	}
-
-	public RemotePortForwarding createRemotePortForwarding(ExecutionManager owner, int remotePort, String localAddress,
-			int localPort) throws RemoteConnectionException, PortForwardingException {
-		assert (remotePort > 0);
-		assert (localPort > 0);
-		assert (owner != null);
-		assert (connection.getSession() != null);
-
-		synchronized (remotePortForwardings) {
-			/*
-			 * Test if the forwarding is not already active.
-			 */
-			Integer remotePortInteger = new Integer(remotePort);
-			RemotePortForwarding remotePortForwarding = remotePortForwardings.get(remotePortInteger);
-			if (remotePortForwarding != null) {
-				throw new PortForwardingException(PortForwardingException.REMOTE_PORT_ALREADY_FORWARDED);
-			}
-
-			/*
-			 * Create a port forwarding in Jsch.
-			 */
-			try {
-				this.connection.getSession().setPortForwardingR(remotePort, localAddress, localPort);
-			} catch (JSchException e) {
-				throw new PortForwardingException(PortForwardingException.REMOTE_FORWARDING_FAILED, e);
-			}
-
-			/*
-			 * Create new forwarding instance and add it to the table.
-			 */
-			remotePortForwarding = new RemotePortForwarding(owner, localPort, localAddress, remotePort);
-			remotePortForwardings.put(remotePortInteger, remotePortForwarding);
-
-			return remotePortForwarding;
-		}
-	}
-
-	public void releaseRemotePortForwarding(RemotePortForwarding remoteForwarding, ExecutionManager owner)
-			throws RemoteConnectionException, PortForwardingException {
-		assert remoteForwarding != null;
-		assert (connection.getSession() != null);
-
-		synchronized (remotePortForwardings) {
-			/*
-			 * Assure the port forwarding that is still active.
-			 */
-			if (!remoteForwarding.isActive()) {
-				throw new PortForwardingException(PortForwardingException.REMOTE_FORWARDING_NOT_ATIVE);
-			}
-
-			/*
-			 * If a execution manager is given as owner, then assure the port
-			 * forwarding belongs to it.
-			 */
-			if (owner != null) {
-				if (remoteForwarding.owner != owner) {
-					throw new PortForwardingException(PortForwardingException.REMOTE_FORWARDING_NOT_ATIVE);
-				}
-			}
-
-			Integer remotePortInteger = new Integer(remoteForwarding.remotePort);
-			assert remotePortForwardings.containsKey(remotePortInteger);
-
-			turnOffRemotePortForwarding(remoteForwarding);
-			remotePortForwardings.remove(remotePortInteger);
-		}
-	}
-
-	public RemotePortForwarding getRemotePortForwarding(int remotePort) throws RemoteConnectionException, PortForwardingException {
-		assert remotePort > 0;
-		assert (connection.getSession() != null);
-
-		synchronized (remotePortForwardings) {
-			Integer remotePortInteger = new Integer(remotePort);
-			return remotePortForwardings.get(remotePortInteger);
-		}
-
-	}
-
-	public void disconnect() {
-		Iterator<RemotePortForwarding> iterator = remotePortForwardings.values().iterator();
-		while (iterator.hasNext()) {
-			RemotePortForwarding forwarding = iterator.next();
-			turnOffRemotePortForwarding(forwarding);
-			iterator.remove();
-		}
-	}
-
-	public void disconnect(ExecutionManager executionManager) {
-		Iterator<RemotePortForwarding> iterator = remotePortForwardings.values().iterator();
-		while (iterator.hasNext()) {
-			RemotePortForwarding forwarding = iterator.next();
-			if (forwarding.owner == executionManager) {
-				turnOffRemotePortForwarding(forwarding);
-				iterator.remove();
-			}
-		}
-	}
-
-	/**
-	 * Auxiliary method used by other methods to turn off a port forwarding.
-	 * 
-	 * @param forwarding
-	 *            The port remote forwarding to be turned off.
-	 */
-	private void turnOffRemotePortForwarding(RemotePortForwarding forwarding) {
-		forwarding.releaseOwner();
-		try {
-			connection.getSession().delPortForwardingR(forwarding.remotePort);
-		} catch (JSchException e) {
-			// No possible exceptions are known.
-			assert false;
-		}
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/SSHRemoteProcess.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/SSHRemoteProcess.java
deleted file mode 100755
index ff2183e..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/SSHRemoteProcess.java
+++ /dev/null

@@ -1,119 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.eclipse.ptp.remotetools.core.IRemoteScriptExecution;
-import org.eclipse.ptp.remotetools.core.RemoteProcess;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteExecutionException;
-
-
-public class SSHRemoteProcess extends RemoteProcess {
-	
-	IRemoteScriptExecution execution;
-	private InputStream errorStream;
-	private InputStream inputStream;
-	private OutputStream outputStream;
-	
-	class ExecutionCloser extends Thread {
-		public void run() {
-			try {
-				execution.waitForEndOfExecution();
-			} catch (RemoteConnectionException e) {
-			} catch (RemoteExecutionException e) {
-			} catch (CancelException e) {
-			}
-			execution.close();
-		}
-	}
-	
-	public SSHRemoteProcess(IRemoteScriptExecution execution) {
-		this.execution = execution;
-		try {
-			this.errorStream = execution.getInputStreamFromProcessErrorStream();
-			this.outputStream = execution.getOutputStreamToProcessInputStream();
-			this.inputStream = execution.getInputStreamFromProcessOutputStream();
-		} catch (IOException e) {
-			throw new IllegalArgumentException(e.getLocalizedMessage());
-		}
-		new ExecutionCloser().start();
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Process#destroy()
-	 */
-	public void destroy() {
-		if (! execution.wasFinished()) {
-			execution.cancel();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Process#exitValue()
-	 */
-	public int exitValue() {
-		if (execution.wasCanceled()) {
-			return -1;
-		} else if (execution.wasFinished()) {
-			return execution.getReturnCode();
-		} else {
-			throw new IllegalThreadStateException();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Process#getErrorStream()
-	 */
-	public InputStream getErrorStream() {
-		return errorStream;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Process#getInputStream()
-	 */
-	public InputStream getInputStream() {
-		return inputStream;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Process#getOutputStream()
-	 */
-	public OutputStream getOutputStream() {
-		return outputStream;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Process#waitFor()
-	 */
-	public int waitFor() throws InterruptedException {
-		try {
-			execution.waitForEndOfExecution();			
-		} catch (RemoteConnectionException e) {
-			return -1;
-		} catch (CancelException e) {
-			return -1;
-		}  catch (RemoteExecutionException e) {
-			return -1;
-		}
-		return exitValue();
-	}
-
-	public IRemoteScriptExecution getRemoteExecution()
-	{
-		return execution;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ScriptExecution.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ScriptExecution.java
deleted file mode 100755
index bbdda4e..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ScriptExecution.java
+++ /dev/null

@@ -1,120 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.eclipse.ptp.remotetools.core.IRemoteScriptExecution;
-import org.eclipse.ptp.remotetools.core.messages.Messages;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.internal.common.Debug;
-import org.eclipse.ptp.remotetools.internal.common.RemoteScript;
-
-import com.jcraft.jsch.ChannelExec;
-
-/**
- * @author richardm
- * 
- */
-public class ScriptExecution extends KillableExecution implements IRemoteScriptExecution {
-
-	protected RemoteScript remoteScript;
-	
-	protected InputStream fromProcessOutput;
-	protected InputStream fromProcessError;
-	protected OutputStream toProcessInput;
-
-
-	protected ScriptExecution(ExecutionManager executionManager, RemoteScript remoteScript)
-			throws RemoteConnectionException {
-		super(executionManager);
-		this.remoteScript = remoteScript;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.internal.ssh.KillableExecution#startExecution()
-	 */
-	public void startExecution() throws RemoteConnectionException {
-		String commandline = getRemoteScript().getScriptString();
-		ChannelExec channel = createChannel(getRemoteScript().getAllocateTerminal());
-		setCommandLine(commandline);
-
-		try {
-			if (remoteScript.getInputStream() != null) {
-				channel.setInputStream(remoteScript.getInputStream());
-			} else if (remoteScript.getFetchProcessInputStream()) {
-				toProcessInput = channel.getOutputStream();
-			}
-		
-			if (remoteScript.getOutputStream() != null) {
-				channel.setOutputStream(remoteScript.getOutputStream());
-			} else if (remoteScript.getFetchProcessOutputStream()) {
-				fromProcessOutput = channel.getInputStream();
-			}
-			
-			if (remoteScript.getErrorStream() != null) {
-				channel.setErrStream(remoteScript.getErrorStream());
-			} else if (remoteScript.getFetchProcessErrorStream()) {
-				fromProcessError = channel.getErrStream();
-			}
-		} catch (IOException e) {
-			throw new RemoteConnectionException(Messages.ScriptExecution_StartExecution_FailedInitStreams, e);
-		}
-		channel.setXForwarding(remoteScript.willForwardX11());
-
-		super.startExecution();
-		Debug.println("Executing " + commandline); //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.remotetools.IRemoteCommandExecution#getInputStreamFromProcessOutputStream()
-	 */
-	public InputStream getInputStreamFromProcessOutputStream() throws IOException {
-		if (fromProcessOutput == null) {
-			throw new IllegalStateException();
-		}
-		return fromProcessOutput;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.remotetools.IRemoteCommandExecution#getInputStreamFromProcessErrorStream()
-	 */
-	public InputStream getInputStreamFromProcessErrorStream() throws IOException {
-		if (fromProcessError == null) {
-			throw new IllegalStateException();
-		}
-		return fromProcessError;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.remotetools.IRemoteCommandExecution#getOutputStreamFromProcessInputStream()
-	 */
-	public OutputStream getOutputStreamToProcessInputStream() throws IOException {
-		if (toProcessInput == null) {
-			throw new IllegalStateException();
-		}
-		return toProcessInput;
-	}
-
-	public RemoteScript getRemoteScript() {
-		return (RemoteScript) remoteScript;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/StatusTools.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/StatusTools.java
deleted file mode 100755
index 6a7c228..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/StatusTools.java
+++ /dev/null

@@ -1,443 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionTools;
-import org.eclipse.ptp.remotetools.core.IRemoteFileTools;
-import org.eclipse.ptp.remotetools.core.IRemoteStatusTools;
-import org.eclipse.ptp.remotetools.core.messages.Messages;
-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;
-
-
-/**
- * Concrete class responsible for returning status data from the remote host
- * 
- * NOTE: This implementation assumes that the remote host is Linux based
- * 
- * @author Richard Maciel
- *
- */
-public class StatusTools implements IRemoteStatusTools {
-	private ExecutionManager manager;
-	private UserInformation userInfoCache;
-	
-	/**
-	 * This class is responsible for caching information that is "stable" enough to be stored and retrieved
-	 * instead of generated every time.  
-	 *
-	 * @author Richard Maciel
-	 *
-	 */
-	class UserInformation {
-		private Integer userID;
-		private Set<Integer> groupIDSet;
-		private String username;
-		
-		public UserInformation(Integer userID, Set<Integer> groupIDSet, String username) {
-			this.userID = userID;
-			this.groupIDSet = groupIDSet;
-			this.username = username;
-		}
-
-		/**
-		 * @return the userID
-		 */
-		public Integer getUserID() {
-			return userID;
-		}
-
-		/**
-		 * @return the groupIDSet
-		 */
-		public Set<Integer> getGroupIDSet() {
-			return groupIDSet;
-		}
-
-		/**
-		 * @return the username
-		 */
-		public String getUsername() {
-			return username;
-		}
-	}
-	
-	protected StatusTools(ExecutionManager manager) {
-		this.manager = manager;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteStatusTools#getRemotePortsInUse(int)
-	 */
-	public Set<Integer> getRemotePortsInUse(int protocol) throws RemoteConnectionException, RemoteOperationException, CancelException {
-		// Uses the following shell script to get a list of used ports in the
-		// remote host:
-		// cat /proc/net/<transport protocol>
-		// Then, the data coming from the command is filtered using java commands equivalent to the
-		// following shell command:
-		// cat /proc/net/tcp | tail -n +2 | sed -r 's/^\s+//g' | cut -d ' ' -f 2 | cut -d ':' -f 2
-
-		
-		HashSet<Integer> portSet = new HashSet<Integer>(); 
-		String protoStr = null, protoStr6 = null;
-		if(protocol == IRemoteStatusTools.PROTO_UDP) {
-			protoStr = "cat /proc/net/udp"; //$NON-NLS-1$
-			protoStr6 = "cat /proc/net/udp6"; //$NON-NLS-1$
-		} else if (protocol == IRemoteStatusTools.PROTO_TCP){
-			protoStr = "cat /proc/net/tcp"; //$NON-NLS-1$
-			protoStr6 = "cat /proc/net/tcp6"; //$NON-NLS-1$
-		} 
-		
-		try {
-			IRemoteExecutionTools remExecTools = manager.getExecutionTools(); 
-			
-			// Filter information from files.
-			/*
-			 * "protoOutput" and "proto6Output" are the 
-			 * outputs of the above commands, WITHOUT the header 
-			 * that is being wiped out by the "replaceFirst" 
-			 * method. Thus, the resulting string
-			 * "rawProcOutput" contains only valid connection
-			 * entries for both ipv4 and ipv6 and must be
-			 * totally processed on the following loop.
-			 * 
-			 */
-			String protoOutput = remExecTools.executeWithOutput(protoStr).
-				replaceFirst("^\\p{Space}*sl.*inode\\p{Space}*\\n", ""); //$NON-NLS-1$ //$NON-NLS-2$
-			String proto6Output = remExecTools.executeWithOutput(protoStr6).
-				replaceFirst("^\\p{Space}*sl.*inode\\p{Space}*\\n", ""); //$NON-NLS-1$ //$NON-NLS-2$
-			
-			String rawProcOutput = protoOutput.concat(proto6Output); 
-			
-			String [] rawProcLines = rawProcOutput.split("\n"); //$NON-NLS-1$
-			
-			for(int i=0; i < rawProcLines.length; i++) {
-				// Trim the beginning of each line, and split the string using
-				// whitespace as separator.
-				String [] procFields = rawProcLines[i].trim().split(" "); //$NON-NLS-1$
-
-				// Get the second field and split it using ':' as separator.
-				// Get the second field.
-				String [] addrFields = procFields[1].split(":"); //$NON-NLS-1$
-				String allocedPort = addrFields[1];
-
-				// Convert the value to an integer (it's on base 16) 
-				// and put it into the set.
-				portSet.add(Integer.valueOf(allocedPort, 16));
-			}
-		} catch (RemoteExecutionException e) {
-			throw new RemoteOperationException(e);
-		}
-		
-		return portSet;
-	}
-
-	private static int PASSWD_USERNAME_FIELD = 0;
-	private static int PASSWD_USERID_FIELD = 2;
-	private static int PASSWD_GROUPID_FIELD = 3;
-	private static int PASSWD_HOMEDIR_FIELD = 5;
-	
-	private static int GROUP_GROUPID_FIELD = 2;
-	private static int GROUP_USERLIST_FIELD = 3;
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteStatusTools#getGroupIDSet()
-	 */
-	public Set<Integer> getGroupIDSet() throws RemoteConnectionException, RemoteOperationException, CancelException {
-//		 If there's already information on cache, use it
-		if(userInfoCache == null) {
-			userInfoCache = fetchRemoteUserInfo();
-		}			
-		return userInfoCache.getGroupIDSet();
-	}
-
-	/**
-	 * An implementation of the {@link getGroupIDSet} method that only uses the cat command on the remote machine
-	 * to extract desired data. Specifically, it retrieves information from the /etc/passwd looking and /etc/group files
-	 * and extract the information about the groups of the user whose username comes from the {@link getUsername} method
-	 * 
-	 * @return
-	 * @throws RemoteConnectionException
-	 * @throws RemoteOperationException
-	 * @throws CancelException
-	 */
-	private Set<Integer> getGroupIDSet_CatBased() throws RemoteConnectionException, RemoteOperationException, CancelException {
-		String [] passwdFields = getPasswdFields(); 
-		String username = passwdFields[PASSWD_USERNAME_FIELD].trim();
-		String strPasswdGroupID = passwdFields[PASSWD_GROUPID_FIELD].trim();
-		Set<Integer> groupIDSet = new HashSet<Integer>();
-		
-		// Put the the group from the passd file into the list (if not blank)
-		if(!strPasswdGroupID.trim().equals("")) { //$NON-NLS-1$
-			groupIDSet.add(new Integer(Integer.parseInt(strPasswdGroupID)));
-		}
-		
-		/*
-		 * Get the group file and search for the groups that the user belongs
-		 * to.
-		 */
-		// Cat the /etc/group file and split it in lines
-		IRemoteExecutionTools remExecTools = manager.getExecutionTools();
-		try {
-			String rawGroup = remExecTools.executeWithOutput("cat /etc/group"); //$NON-NLS-1$
-			String [] rawGroupLines = rawGroup.split("\\n"); //$NON-NLS-1$
-			
-			for(int i=0; i < rawGroupLines.length; i++) {
-				// Last field can be non-existant, so use a negative parameter in split to
-				// make sure it becomes a field
-				String [] groupFields = rawGroupLines[i].split(":", -1); //$NON-NLS-1$
-				// Search for the username in the list of users of the group.
-				// IF the username belongs to the group, insert it into the list.
-				if(isUsernameInList(username, groupFields[GROUP_USERLIST_FIELD].split(","))) { //$NON-NLS-1$
-					groupIDSet.add(new Integer(Integer.parseInt(groupFields[GROUP_GROUPID_FIELD].trim())));
-				}
-			}
-		} catch (RemoteExecutionException e) {
-			throw new RemoteOperationException(e);
-		}
-		// Returns the set
-		return groupIDSet;
-	}
-	
-	/**
-	 * Given a list of usernames, verifies if user belongs to it.
-	 * 
-	 * @param username
-	 * @param usernameList
-	 * @return
-	 */
-	private boolean isUsernameInList(String username, String [] usernameList) {
-		for(int i=0; i < usernameList.length; i++) {
-			if(usernameList[i].trim().equals(username)) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteStatusTools#getUserID()
-	 */
-	public int getUserID() throws RemoteConnectionException, RemoteOperationException, CancelException {
-		// If there's already information on cache, use it
-		if(userInfoCache == null) {
-			userInfoCache = fetchRemoteUserInfo();
-		}			
-		return userInfoCache.getUserID().intValue();
-	}
-	
-	/**
-	 * An implementation of the {@link getUserID} method that only uses the cat command on the remote machine
-	 * to extract desired data. Specifically it reads information from the /etc/passwd file and parses it to
-	 * retrieve the user id.
-	 * 
-	 * @return
-	 * @throws RemoteConnectionException
-	 * @throws RemoteOperationException
-	 * @throws CancelException
-	 */
-	public int getUserID_CatBased() throws RemoteConnectionException, RemoteOperationException, CancelException {
-//		 Get the field userid from the result of the getPasswdFields method
-		// and return it.
-		String strUserID = getPasswdFields()[PASSWD_USERID_FIELD]; 
-		return Integer.parseInt(strUserID);
-	}
-	
-	/**
-	 * Get the line that has the user information from the passwd file
-	 * 
-	 * @return String [] A vector containing the fields or null if no user matches
-	 * @throws RemoteOperationException 
-	 * @throws CancelException 
-	 * @throws RemoteConnectionException 
-	 */
-	private String [] getPasswdFields() throws RemoteOperationException, RemoteConnectionException, CancelException {
-		String currentUsername = getUsername_WhoamiBased();
-		IRemoteExecutionTools remExecTools = manager.getExecutionTools();
-		
-		try {
-			// Get lines from the passwd
-			String rawPasswd = remExecTools.executeWithOutput("cat /etc/passwd"); //$NON-NLS-1$
-			String [] rawPasswdLines = rawPasswd.split("\\n"); //$NON-NLS-1$
-			
-			// Look for the string that matches the value from the currentUsername
-			// That string is on the first line 
-			for(int i=0; i < rawPasswdLines.length; i++) {
-				// Make sure it includes the last field even if it's blank.
-				String [] passwdFields = rawPasswdLines[i].split(":", -1); //$NON-NLS-1$
-				if(passwdFields[PASSWD_USERNAME_FIELD].equals(currentUsername))
-					return passwdFields;
-			}
-		} catch (RemoteExecutionException e) {
-			throw new RemoteOperationException(e);
-		}
-		
-		throw new RuntimeException(Messages.RemoteStatusTools_GetPasswdFields_NoUsernameInPasswdFile);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.core.IRemoteStatusTools#getUsername()
-	 */
-	public String getUsername() throws RemoteConnectionException, RemoteOperationException,
-		CancelException {
-		if(userInfoCache == null) {
-			userInfoCache = fetchRemoteUserInfo();
-		}			
-		return userInfoCache.getUsername();
-	}
-	
-	/**
-	 * * An implementation of the {@link getUsername} method that uses the whoami command on the remote machine
-	 * to extract username information. 
-	 * 
-	 * @return
-	 * @throws RemoteConnectionException
-	 * @throws RemoteOperationException
-	 * @throws CancelException
-	 */
-	private String getUsername_WhoamiBased() throws RemoteConnectionException, RemoteOperationException,
-	CancelException {
-//		 Get information from the whoami command
-		try {
-			IRemoteExecutionTools remExecTools = manager.getExecutionTools();
-			String rawWhoAmI = remExecTools.executeWithOutput("whoami"); //$NON-NLS-1$
-			return rawWhoAmI.trim();
-		} catch (RemoteExecutionException e) {
-			throw new RemoteOperationException(e);
-		}
-	}
-
-	/**
-	 * A method designed to parse the /etc/group file to find the list
-	 * of groups that a user is enrolled in. 
-	 * 
-	 * @param username The name of the user that we are searching for enrollments.
-	 * @return A list of groups that username belongs to.
-	 * @throws RemoteConnectionException 
-	 * @throws RemoteOperationException 
-	 */
-	private Set<Integer> readGroupList(String username) throws RemoteConnectionException, RemoteOperationException {
-		Set<Integer> groupList = new HashSet<Integer>();
-
-		BufferedReader etcGroupFile = null;
-		
-		try {
-			IRemoteFileTools ft = manager.getRemoteFileTools();
-			InputStream is = ft.getInputStream("/etc/group",null); //$NON-NLS-1$
-			etcGroupFile = new BufferedReader(new InputStreamReader(is ));
-			
-			String line = etcGroupFile.readLine();
-
-			while (line != null) {
-				String[] fields = line.split(":"); //$NON-NLS-1$
-
-				if (fields[0].trim().compareTo(username) == 0) {
-					groupList.add(new Integer(fields[2]));
-				} else if (fields.length == 4) {
-
-					String[] users = fields[3].split(","); //$NON-NLS-1$
-					for (int i = 0; i < users.length; i++) {
-
-						if (users[i].trim().compareTo(username) == 0) {
-							groupList.add(new Integer(fields[2]));
-						}
-					}
-				}
-
-				line = etcGroupFile.readLine();
-			}
-		} catch (IOException ioe) {
-			throw new RemoteOperationException(ioe);
-		} catch (CancelException ce) {
-			throw new RemoteOperationException(ce);
-		} catch (NumberFormatException nfe) {
-			//Maybe the format of this /etc/group file put the fields in a
-			//different order.
-			throw new RemoteOperationException(nfe);
-		} catch (ArrayIndexOutOfBoundsException aioobe) {
-			//This case is going to happen if the format is not the expected one.
-			throw new RemoteOperationException(aioobe);
-		}
-		finally {
-			try {
-			    if (etcGroupFile != null) { 
-			    	etcGroupFile.close(); 
-			    }
-			} catch (IOException ioe) {throw new RemoteOperationException(ioe);}
-		} 
-		return groupList;
-	}
-	
-	/**
-	 * Return all the user information from the remote machine.
-	 * This operation is a bit slow and should be used only once per RemoteStatusTools object.
-	 * 
-	 * @throws RemoteConnectionException
-	 * @throws RemoteOperationException
-	 * @throws CancelException
-	 * @return 
-	 */
-	private UserInformation fetchRemoteUserInfo() throws RemoteConnectionException, RemoteOperationException,
-		CancelException {
-		try {
-			//Set of groups that this user belongs to.
-			Set<Integer> groupList;
-			
-			IRemoteExecutionTools remExecTools = manager.getExecutionTools();
-			// Execute command to return the username, uid and the group list
-			String rawUserInfo = remExecTools.executeWithOutput("echo `id -un`:`id -u`:`id -G`"); //$NON-NLS-1$
-			
-			String [] userInfoFields = rawUserInfo.trim().split(":", -1);  //$NON-NLS-1$
-			
-			//With systems using BusyBox, id has no argument -G
-			//so we must parse /etc/group in this case
-			if (userInfoFields[2].trim().equalsIgnoreCase("")) { //$NON-NLS-1$
-				groupList = readGroupList(userInfoFields[0]);
-			} else {
-				String[] groupFields = userInfoFields[2].split(" ", -1); //$NON-NLS-1$
-
-				groupList = new HashSet<Integer>();
-
-				for (int i = 0; i < groupFields.length; i++) {
-					// Convert groups to Integer and put into the Set
-					groupList.add(new Integer(groupFields[i]));
-				}
-			}
-			
-			return new UserInformation(new Integer(userInfoFields[1]), groupList, userInfoFields[0]);
-		} catch (RemoteExecutionException e) {
-			throw new RemoteOperationException(e);
-		}
-	}
-	
-	public long getTime() throws RemoteConnectionException, RemoteOperationException, CancelException {
-		try {
-			IRemoteExecutionTools execTools = manager.getExecutionTools();
-			String rawData = execTools.executeWithOutput("date +'%s'"); //$NON-NLS-1$
-			rawData = rawData.trim();
-			return Long.parseLong(rawData)*1000;
-		} catch (RemoteExecutionException e) {
-			throw new RemoteOperationException(e);
-		}
-	}
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/UploadExecution.java b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/UploadExecution.java
deleted file mode 100755
index 40bfac9..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/UploadExecution.java
+++ /dev/null

@@ -1,74 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.internal.ssh;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.eclipse.ptp.remotetools.core.IRemotePathTools;
-import org.eclipse.ptp.remotetools.core.IRemoteUploadExecution;
-import org.eclipse.ptp.remotetools.core.messages.Messages;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.internal.common.Debug;
-
-import com.jcraft.jsch.ChannelExec;
-
-public class UploadExecution extends KillableExecution implements IRemoteUploadExecution {
-
-	String remoteFile;
-	InputStream sourceStream;
-	ByteArrayOutputStream errorStream;
-	OutputStream outputStream;
-
-	public UploadExecution(ExecutionManager executionManager, String remoteFile, InputStream source) throws RemoteConnectionException {
-		super(executionManager);
-		this.sourceStream = source;
-		this.remoteFile = remoteFile;
-		errorStream = new ByteArrayOutputStream();
-	}
-
-	public OutputStream getOutputStreamToProcessRemoteFile() {
-		if (sourceStream != null) {
-			throw new IllegalStateException();
-		}
-		return outputStream;
-	}
-
-	@Override
-	public void startExecution() throws RemoteConnectionException {
-
-		ChannelExec channel = createChannel(false);
-		IRemotePathTools pathTool = getExecutionManager().getRemotePathTools();
-		setCommandLine("cat >" + pathTool.quote(remoteFile, true)); //$NON-NLS-1$
-
-		if (sourceStream != null) {
-			channel.setInputStream(sourceStream);
-			outputStream = null;
-		} else {
-			try {
-				outputStream = channel.getOutputStream();
-			} catch (IOException e) {
-				throw new RemoteConnectionException(Messages.UploadExecution_StartExecution_FailedCreateUpload, e);
-			}
-		}
-		channel.setErrStream(errorStream);
-
-		super.startExecution();
-		Debug.println("Uploading " + remoteFile); //$NON-NLS-1$
-	}
-
-	public String getErrorMessage() {
-		return errorStream.toString();
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ciphertypesmessages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ciphertypesmessages.properties
deleted file mode 100755
index 475a675..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.core/src/org/eclipse/ptp/remotetools/internal/ssh/ciphertypesmessages.properties
+++ /dev/null

@@ -1,25 +0,0 @@
-###############################################################################
-# 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
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-NAME_BLOWFISH=Blowfish (fastest)
-NAME_3DES=3DES
-NAME_AES128=AES128
-NAME_AES192=AES192
-NAME_AES256=AES256
-NAME_DEFAULT=Internal SSH client default
-
-KEY_BLOWFISH=blowfish-cbc
-KEY_3DES=3des-cbc
-KEY_AES128=aes128-cbc
-KEY_AES192=aes192-cbc
-KEY_AES256=aes256-cbc
-KEY_DEFAULT=default
-
-CipherTypes.AttributeNameExceptionMsg2=Did not find attribute NAME_ {0} to match

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/.classpath b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/.classpath
deleted file mode 100755
index 64c5e31..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.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/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/.project b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/.project
deleted file mode 100755
index ae9a1f2..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.remotetools.environment.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/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/.settings/org.eclipse.jdt.core.prefs b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 64d2aea..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,8 +0,0 @@
-#Fri Apr 16 12:58:15 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/remotetools/org.eclipse.ptp.remotetools.environment.core/META-INF/MANIFEST.MF b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/META-INF/MANIFEST.MF
deleted file mode 100755
index 8745a02..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.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.remotetools.environment.core;singleton:=true
-Bundle-Version: 1.3.3.qualifier
-Bundle-Activator: org.eclipse.ptp.remotetools.environment.EnvironmentPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.ptp.remotetools.core,
- org.eclipse.ptp.remotetools.utils,
- org.eclipse.core.filesystem,
- org.eclipse.equinox.security;bundle-version="1.0.1",
- org.eclipse.ptp.utils.core;bundle-version="1.0.0"
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.ptp.remotetools.environment,
- org.eclipse.ptp.remotetools.environment.control,
- org.eclipse.ptp.remotetools.environment.core,
- org.eclipse.ptp.remotetools.environment.extension,
- org.eclipse.ptp.remotetools.environment.wizard,
- org.eclipse.ptp.remotetools.utils.verification
-Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/about.html b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/about.html
deleted file mode 100755
index a78242d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/about.html
+++ /dev/null

@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/build.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/build.properties
deleted file mode 100755
index 1ac9adf..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/build.properties
+++ /dev/null

@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               schema/,\
-               about.html,\
-               plugin.properties

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/plugin.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/plugin.properties
deleted file mode 100644
index b51d868..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.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 Remote Tools Target Environments Core
-pluginProvider=Eclipse.org

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/plugin.xml b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/plugin.xml
deleted file mode 100755
index b0782c3..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/plugin.xml
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   <extension-point id="remoteEnvironmentControlDelegate" name="Remote Environment Control Delegate" schema="schema/remoteEnvironmentControlDelegate.exsd"/>
-   <extension-point id="childrenProvider" name="Target Element Children Provider" schema="schema/childrenProvider.exsd"/>
-  
-</plugin>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/schema/childrenProvider.exsd b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/schema/childrenProvider.exsd
deleted file mode 100644
index 9930a5a..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/schema/childrenProvider.exsd
+++ /dev/null

@@ -1,112 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ptp.remotetools.environment.core">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ptp.remotetools.environment.core" id="childrenProvider" name="Target Element Children Provider"/>
-      </appInfo>
-      <documentation>
-         Contributor contributes an instance of IChildrenProvider, which provides children to existing target elements. For contributing children of the target elements&apos; children, contributor should make them implementing INode.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="childrenProvider"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="childrenProvider">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.ptp.remotetools.environment.extension.IChildrenProvider"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/schema/remoteEnvironmentControlDelegate.exsd b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/schema/remoteEnvironmentControlDelegate.exsd
deleted file mode 100755
index b3dd9c9..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/schema/remoteEnvironmentControlDelegate.exsd
+++ /dev/null

@@ -1,112 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ptp.remotetools.environment.core">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ptp.remotetools.environment.core" id="remoteEnvironmentControlDelegate" name="Remote Environment Control Delegate"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="control" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="control">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.ptp.remotetools.environment.extension.ITargetTypeExtension"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         2.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/EnvironmentPlugin.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/EnvironmentPlugin.java
deleted file mode 100755
index 84bef3e..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/EnvironmentPlugin.java
+++ /dev/null

@@ -1,164 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment;
-
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControl;
-import org.eclipse.ptp.remotetools.environment.core.ChildrenProviderManager;
-import org.eclipse.ptp.remotetools.environment.core.ITargetElement;
-import org.eclipse.ptp.remotetools.environment.core.TargetEnvironmentManager;
-import org.eclipse.ptp.remotetools.environment.core.TargetTypeElement;
-import org.eclipse.ptp.remotetools.environment.extension.ITargetTypeExtension;
-import org.eclipse.ptp.utils.core.extensionpoints.IProcessMemberVisitor;
-import org.eclipse.ptp.utils.core.extensionpoints.ProcessExtensions;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * The main plugin class to be used in the desktop.
- * 
- * @author Ricardo M. Matinata
- * @since 1.1
- */
-public class EnvironmentPlugin extends Plugin {
-
-	final public static String FILENAME = "environments.xml"; //$NON-NLS-1$
-	final public static String EXT_CONTROLS_ID = "org.eclipse.ptp.remotetools.environment.core.remoteEnvironmentControlDelegate"; //$NON-NLS-1$
-	final private static String ID = "org.eclipse.ptp.remotetools.environment.core"; //$NON-NLS-1$
-
-	//The shared instance.
-	private static EnvironmentPlugin plugin;
-	private TargetEnvironmentManager manager;
-	private ChildrenProviderManager childrenProviderMgr;
-
-	/**
-	 * The constructor.
-	 */
-	public EnvironmentPlugin() {
-		plugin = this;
-	}
-
-	public Map<String, ITargetTypeExtension> getControls() {
-		final Map<String, ITargetTypeExtension> controls = new HashMap<String, ITargetTypeExtension>();
-		ProcessExtensions.process(EXT_CONTROLS_ID, new IProcessMemberVisitor() {
-
-			public Object process(IExtension extension, IConfigurationElement member) {
-				Object mprovider;
-				try {
-					
-					mprovider = member.createExecutableExtension("class"); //$NON-NLS-1$
-					if ( ITargetTypeExtension.class.isAssignableFrom(mprovider.getClass()) ) {
-						controls.put(member.getAttribute("name"), (ITargetTypeExtension)mprovider); //$NON-NLS-1$
-					}
-				} catch (CoreException e) {
-					mprovider = null;
-				}
-				
-				return mprovider;
-			}
-			
-		});
-		return controls;
-	}
-
-	public TargetEnvironmentManager getTargetsManager() {
-		if (manager == null)
-			manager = new TargetEnvironmentManager();
-		return manager;
-	}
-	
-	public ChildrenProviderManager getChildrenProviderManager() {
-		if (childrenProviderMgr == null) {
-			childrenProviderMgr = new ChildrenProviderManager();
-		}
-		return childrenProviderMgr;
-	}
-	
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		manager.writeToFile();
-		plugin = null;
-	}
-
-	/**
-	 * Notifies all target elements of the plugin that includes
-	 * the parameter class. This parameter class must implement the
-	 * ITargetTypeExtension interface.
-	 * 
-	 * @param Class The class that implements the ITargetTypeExtension interface
-	 */
-	@SuppressWarnings("unchecked")
-	public synchronized void destroyTypeElements(Class extensionClass) {
-		// Find the TargetTypeElement that contains an extension which class is
-		// equivalent to the argument.
-		List<TargetTypeElement> typeList = getTargetsManager().getTypeElements();
-		for (TargetTypeElement typeElement : typeList) {
-			if(typeElement.getExtension().getClass().equals(extensionClass)) {
-				// NOTE: At this point the called plugin should not be closed, so
-				// its safe to play around with its values.
-				
-				// Call the destroy method of all elements of the given type
-				List<ITargetElement> elemList = typeElement.getElements();
-				for (ITargetElement el : elemList) {
-					try { // Errors could happen when disabling the environment. Just ignore.
-						ITargetControl ctl = el.getControl();
-						ctl.destroy();
-					} catch (Throwable t) {	}
-				}
-			}
-		}
-	}
-	
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static EnvironmentPlugin getDefault() {
-		return plugin;
-	}
-
-	public static String getUniqueIdentifier() {
-		
-		return ID;
-	}
-	
-	/*
-	 * Unique ID generation for environment instances
-	 * This ID is generation comes from the system's timestamp. 
-	 */
-	public String getEnvironmentUniqueID() {
-		long envID = System.currentTimeMillis();
-		return String.valueOf(envID);
-	}
-
-//	 Key that address the unique identifier of a given environment instance
-	public static final String ATTR_CORE_ENVIRONMENTID = "core-environmentid"; //$NON-NLS-1$
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControl.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControl.java
deleted file mode 100755
index 7bf2109..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControl.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.control;
-
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ptp.remotetools.core.IRemoteConnection;
-
-
-/**
- * Controls an instance of a target created from the Environment.
- * @author Ricardo M. Matinata, Daniel Felix Ferber, Richard Maciel
- * @since 1.1
- */
-public interface ITargetControl {
-	/**
-	 * Called to create an instance of the target.
-	 * @param monitor
-	 * @return
-	 * @throws CoreException
-	 */
-	public boolean create(IProgressMonitor monitor) throws CoreException;
-	
-	/**
-	 * Called to halt the instance of the target.
-	 * @param monitor
-	 * @return
-	 * @throws CoreException
-	 */
-	public boolean kill(IProgressMonitor monitor) throws CoreException;
-
-	/**
-	 * Called to remove information associated with the instance of the target
-	 * because the it was removed.
-	 * @throws CoreException
-	 */
-	public void destroy() throws CoreException;
-	
-	public int query();
-	
-	public boolean resume(IProgressMonitor monitor) throws CoreException;
-	
-	public boolean stop(IProgressMonitor monitor) throws CoreException;
-	
-	/**
-	 * This method is a callback called when the ITargetControl implementing class
-	 * must update its configuration because an external change occurred.
-	 * 
-	 * @throws CoreException
-	 */
-	public void updateConfiguration() throws CoreException;
-	
-	/**
-	 * @deprecated
-	 */
-	public boolean executeRemoteCommand(IProgressMonitor monitor, String command, String[] args) throws CoreException;
-
-	/**
-	 * Gets the execution framework.
-	 * @deprecated
-	 * @return
-	 */
-	public IRemoteConnection getConnection();
-	
-	/**
-	 * Adds a new job to the set of running jobs on the environment.
-	 * The job will begin execution as soon as possible after being added.
-	 * @param job The job to be added and executed.
-	 * @return The job encapsulated as a IRemoteControlledJob
-	 * @throws CoreException 
-	 */
-	public void startJob(ITargetJob job) throws CoreException;
-
-	/**
-	 * Returns how many jobs are being managed by the control. 
-	 */
-	public int getJobCount();
-	
-	/**
-	 * Returns an array of all jobs running remotely.
-	 * All jobs are returned, regardless if WAITING or RUNNING.
-	 * Finished jobs are automatically removed from the list.
-	 * 
-	 * @return The array of remote jobs.
-	 */
-	public ITargetJob [] getJobs();
-	
-	public class TargetSocket {
-		public String host;
-		public int port;
-	}
-	/**
-	 * Create a bridge to a listening socket on the target environment.
-	 * @throws CoreException 
-	 */
-	public TargetSocket createTargetSocket(int port) throws CoreException;
-
-	/**
-	 * Add a new job listener.
-	 */
-	public void addJobListener(ITargetControlJobListener listener);
-
-	/**
-	 * Remove a job listener.
-	 */
-	public void removeJobListener(ITargetControlJobListener listener);
-}
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControlEventListener.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControlEventListener.java
deleted file mode 100755
index bca71b1..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControlEventListener.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.control;
-
-/**
- * Interface for target control event listeners. 
- * 
- * @author Ricardo M. Matinata
- * @since 1.2
- */
-public interface ITargetControlEventListener {
-
-	/**
-	 * Notifies the listener that the state change event has occurred.
-	 * 
-	 * @param event the event code as in {@link ITargetStatus}
-	 * @param from the originating control
-	 */
-	public void handleStateChangeEvent(int event, ITargetControl from);
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControlEventProvider.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControlEventProvider.java
deleted file mode 100755
index 75e46f2..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControlEventProvider.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.control;
-
-/**
- * 
- * Interface definition of event providers for Target Controls.
- * {@link ITargetControl} instances can optionally provide an implementation of this interface thru the
- * IAdaptable mechanism.
- * 
- * @author Ricardo M. Matinata
- * @since 1.2
- */
-public interface ITargetControlEventProvider {
-
-	/**
-	 * Registers a listener to the event provider, keyed by a control instance.
-	 * 
-	 * @param control the control generating events
-	 * @param listener the interested listener
-	 */
-	public void registerControlAndListener(ITargetControl control, ITargetControlEventListener listener);
-	
-	/**
-	 * Unregisters a control,listener tuple from this event provider
-	 * 
-	 * @param control the control generating events
-	 * @param listener the interested listener
-	 */
-	public void unregisterControlAndListener(ITargetControl control, ITargetControlEventListener listener);
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControlJobListener.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControlJobListener.java
deleted file mode 100755
index b31a01c..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetControlJobListener.java
+++ /dev/null

@@ -1,17 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.control;
-
-public interface ITargetControlJobListener {
-	public void beforeJobStart(ITargetJob job);
-	public void afterJobFinish(ITargetJob job);
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetJob.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetJob.java
deleted file mode 100755
index 2affa1d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetJob.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.control;
-
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-
-/**
- * Describes a job that will run on a remote host.
- * <p>
- * Job is a collection of sequential operations executed using the IRemoteExecutionManager
- * on the target environment.
- * <p> 
- * The ITargetJob be run as a thread inside the Job Controller.
- *
- * @author Daniel Felix Ferber
- * @since 1.1
- */
-public interface ITargetJob {
-	/**
-	 * Implementation of the job.
-	 * <p>
-	 * The IRemoteExecutionManager that is capable of doing the operations
-	 * will be provided automatically.
-	 */
-	void run(IRemoteExecutionManager manager);	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetStatus.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetStatus.java
deleted file mode 100755
index eadb1ad..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/ITargetStatus.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.control;
-
-/**
- * 
- * @author Ricardo M. Matinata
- * @since 1.1
- */
-public interface ITargetStatus {
-	
-	final public static int STARTED = 0;
-	final public static int STOPPED = 1;
-	final public static int RESUMED = 2;
-	final public static int PAUSED  = 3;
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/PoolingTargetControlEventProvider.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/PoolingTargetControlEventProvider.java
deleted file mode 100755
index 866b843..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/PoolingTargetControlEventProvider.java
+++ /dev/null

@@ -1,146 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.control;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.ptp.remotetools.environment.control.ITargetControlEventListener;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControlEventProvider;
-import org.eclipse.ptp.remotetools.environment.core.messages.Messages;
-
-
-/**
- * Default implementation of the ITargetControlEventProvider interface, based
- * on a simple pooling algorithm.
- * 
- * @author Ricardo M. Matinata
- * @since 1.2
- *
- */
-public class PoolingTargetControlEventProvider  implements
-		ITargetControlEventProvider {
-
-	public Thread monitorThread = null;
-	private int monitorInterval = 4000; // milliseconds
-	private Map controls = new HashMap();
-	
-	class MonitorThread extends Thread {
-		
-		public MonitorThread() {
-			super(Messages.PoolingTargetControlEventProvider_0);
-		}
-		public void run() {
-			while (monitorThread == this)
-			{
-				synchronized (PoolingTargetControlEventProvider.this) {
-					Iterator ctrls = controls.keySet().iterator();
-					
-					while(ctrls.hasNext()) {
-		
-							ITargetControl control = (ITargetControl) ctrls.next();
-							int entryStatus = control.query();
-							TargetInfo info = (TargetInfo) controls.get(control);
-							
-							if (entryStatus != info.getStatus() ) {
-								info.setStatus(entryStatus);
-								controls.put(control,info);
-								fireEvent(entryStatus, control);
-							}
-						
-					}
-				}
-				
-				try {
-					sleep (monitorInterval);
-				} catch (InterruptedException e) {}
-			}
-		}
-		
-	}
-	
-	public void fireEvent(int status, ITargetControl control) {
-		
-		if (control != null && controls.containsKey (control))
-		{
-			TargetInfo info = (TargetInfo) controls.get(control);
-			ITargetControlEventListener listener = info.getListener();
-			listener.handleStateChangeEvent(status, control);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.control.ITargetControlEventProviderw#registerControlAndListener()
-	 */
-	public void registerControlAndListener(ITargetControl control, ITargetControlEventListener listener) {
-		
-		if (control != null && !controls.containsKey (control))
-		{
-			synchronized(this) {
-				controls.put (control, new TargetInfo(listener,ITargetStatus.STOPPED));
-			}
-			
-			if (monitorThread == null) {
-				(monitorThread = new MonitorThread()).start();
-			}
-		}
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.control.ITargetControlEventProviderw#unregisterControlAndListener()
-	 */
-	public void unregisterControlAndListener(ITargetControl control, ITargetControlEventListener listener) {
-		
-		if (control != null && controls.containsKey (control))
-		{
-			synchronized(this) {
-				controls.remove (control);
-			}
-			
-			if (controls.size() == 0)
-				monitorThread = null;
-		}
-		
-	}
-	
-	class TargetInfo {
-		
-		private int status;
-		private ITargetControlEventListener listener;
-		
-		public TargetInfo(ITargetControlEventListener listener, int status) {
-			this.listener = listener;
-			this.status = status;
-		}
-
-		public ITargetControlEventListener getListener() {
-			return listener;
-		}
-
-		public void setListener(ITargetControlEventListener listener) {
-			this.listener = listener;
-		}
-
-		public int getStatus() {
-			return status;
-		}
-
-		public void setStatus(int status) {
-			this.status = status;
-		}
-		
-	}
-		
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/SSHTargetControl.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/SSHTargetControl.java
deleted file mode 100755
index 30e4c59..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/SSHTargetControl.java
+++ /dev/null

@@ -1,463 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.control;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.Assert;
-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.remotetools.RemotetoolsPlugin;
-import org.eclipse.ptp.remotetools.core.AuthToken;
-import org.eclipse.ptp.remotetools.core.IRemoteConnection;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.core.KeyAuthToken;
-import org.eclipse.ptp.remotetools.core.PasswdAuthToken;
-import org.eclipse.ptp.remotetools.environment.core.messages.Messages;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteExecutionException;
-
-/**
- * Standard implementation of <code>IRemoteJobController</code>. Presumes a
- * target environment that accepts SSH connections.
- * 
- * @see ITargetJobController
- * @author Daniel Felix Ferber
- * @since 1.2
- */
-public abstract class SSHTargetControl implements ITargetControl {
-
-	/**
-	 * Set of jobs running on the remote target environment.
-	 */
-	private final Map<ITargetJob, TargetControlledJob> remoteJobs = new HashMap<ITargetJob, TargetControlledJob>();
-
-	/**
-	 * A connection (using ssh) to the remote target environment.
-	 */
-	private IRemoteConnection remoteConnection = null;
-
-	/**
-	 * Listeners notified when jobs ared added/removed from the target
-	 * environment.
-	 */
-	private final Set<ITargetControlJobListener> jobListeners = new HashSet<ITargetControlJobListener>();
-
-	/**
-	 * Exception to terminate the environment.
-	 */
-	private CoreException pendingException = null;
-
-	/**
-	 * Return a map containing the available cipher types ids and their
-	 * respective names
-	 * 
-	 * @return a Map object containing cipher type ids and cipher type names
-	 */
-	public static Map getCipherTypesMap() {
-		// This method decouples the map from the RemotetoolsPlugin
-		// so its safe to use it on the interface of each environment
-		// that uses this plugin.
-
-		HashMap cipherTypesMap = new HashMap(RemotetoolsPlugin.getCipherTypesMap());
-
-		return cipherTypesMap;
-	}
-
-	/**
-	 * A set of parameters used for authentication with SSH.
-	 * 
-	 * @author Daniel Felix Ferber
-	 * @since 1.2
-	 */
-	protected class SSHParameters {
-		public String hostname;
-		public int port;
-		public String user;
-		public String password;
-		public String keyPath;
-		public String passphrase;
-		public boolean isPasswdAuth;
-		public String cipherType;
-		public int timeout = 0;
-
-		/**
-		 * Constructor for password based authentication and assuming timeout =
-		 * 0
-		 * 
-		 * @param hostname
-		 * @param port
-		 * @param user
-		 * @param password
-		 */
-		public SSHParameters(String hostname, int port, String user, String password) {
-			this(hostname, port, user, password, RemotetoolsPlugin.CIPHER_DEFAULT, 0);
-		}
-
-		/**
-		 * Constructor for password based authentication
-		 * 
-		 * @param hostname
-		 * @param port
-		 * @param user
-		 * @param password
-		 * @param cipherType
-		 *            Choose among the supported ciphers
-		 * @param timeout
-		 */
-		public SSHParameters(String hostname, int port, String user, String password, String cipherType, int timeout) {
-			super();
-			this.hostname = hostname;
-			this.port = port;
-			this.user = user;
-			this.password = password;
-			this.timeout = timeout;
-			this.cipherType = cipherType;
-			isPasswdAuth = true;
-		}
-
-		/**
-		 * Constructor for public/private key based authentication
-		 * 
-		 * @param hostname
-		 * @param port
-		 * @param user
-		 * @param password
-		 * @param cipherType
-		 *            Choose among the supported ciphers
-		 * @param timeout
-		 */
-		public SSHParameters(String hostname, int port, String user, String keyPath, String passphrase, String cipherType,
-				int timeout) {
-			super();
-			this.hostname = hostname;
-			this.port = port;
-			this.user = user;
-			this.keyPath = keyPath;
-			this.passphrase = passphrase;
-			this.timeout = timeout;
-			this.cipherType = cipherType;
-			isPasswdAuth = false;
-		}
-
-		/**
-		 * Constructor for public/private key based authentication assuming
-		 * timeout = 0
-		 * 
-		 * @param hostname
-		 * @param port
-		 * @param user
-		 * @param password
-		 */
-		public SSHParameters(String hostname, int port, String user, String keyPath, String passphrase) {
-			this(hostname, port, user, keyPath, passphrase, RemotetoolsPlugin.CIPHER_DEFAULT, 0);
-		}
-	}
-
-	/**
-	 * The parameters used by the connection to the remote target environment.
-	 */
-	SSHParameters sshParameters;
-
-	/**
-	 * Facility method that raises a SimulatorException with the last error
-	 * detected from and observing thread.
-	 * 
-	 * @throws SimulatorException
-	 */
-	protected synchronized void throwPendingException() throws CoreException {
-		if (pendingException != null) {
-			throw pendingException;
-		}
-	}
-
-	protected synchronized void notifyException(CoreException e) {
-		pendingException = e;
-	}
-
-	/**
-	 * Add a new job listener.
-	 */
-	public synchronized void addJobListener(ITargetControlJobListener listener) {
-		jobListeners.add(listener);
-	}
-
-	/**
-	 * Remove a job listener.
-	 */
-	public synchronized void removeJobListener(ITargetControlJobListener listener) {
-		jobListeners.remove(listener);
-	}
-
-	/**
-	 * Create a waiting job on the
-	 */
-	public synchronized void startJob(ITargetJob job) throws CoreException {
-		if ((query() != ITargetStatus.PAUSED) && (query() != ITargetStatus.RESUMED)) {
-			throw new CoreException(new Status(IStatus.ERROR, getPluginId(), 0, Messages.SSHTargetControl_0, null));
-		}
-		TargetControlledJob controlledJob = new TargetControlledJob(this, job);
-		remoteJobs.put(job, controlledJob);
-		controlledJob.start();
-	}
-
-	protected synchronized void notifyStartingJob(ITargetJob job) {
-		/** Notify listeners. */
-		for (ITargetControlJobListener listener : jobListeners) {
-			listener.beforeJobStart(job);
-		}
-		/** Guarantee that the target is operational. */
-		try {
-			resume(null);
-		} catch (CoreException e) {
-			// Ignore
-		}
-	}
-
-	protected synchronized void notifyFinishedJob(ITargetJob job) {
-		/** Notify listeners. */
-		for (ITargetControlJobListener listener : jobListeners) {
-			listener.afterJobFinish(job);
-		}
-		/** Remove job from list of jobs. */
-		remoteJobs.remove(job);
-	}
-
-	/**
-	 * Returns the number of jobs running on the remote host.
-	 */
-	public synchronized int getJobCount() {
-		return remoteJobs.size();
-	}
-
-	/**
-	 * Returns a list of jobs running on the remote target environment.
-	 */
-	public synchronized ITargetJob[] getJobs() {
-		ITargetJob[] array = new ITargetJob[remoteJobs.size()];
-		remoteJobs.keySet().toArray(array);
-		return array;
-	}
-
-	/**
-	 * Set the connection parameters to be used by
-	 * {@link #create(IProgressMonitor)}.
-	 * 
-	 * @param parameters
-	 */
-	protected synchronized void setConnectionParameters(SSHParameters parameters) {
-		this.sshParameters = parameters;
-	}
-
-	/**
-	 * Create the remote target environment by opening a SSH connection to it.
-	 * First,
-	 * {@link #setConnectionParameters(org.eclipse.ptp.remotetools.environment.control.SSHTargetControl.SSHParameters)
-	 * must be called.
-	 */
-	public boolean create(IProgressMonitor monitor) throws CoreException {
-		Assert.isNotNull(sshParameters, "missing ssh parameters"); //$NON-NLS-1$
-		try {
-			if (monitor.isCanceled()) {
-				disconnect();
-				throw new CoreException(new Status(IStatus.CANCEL, getPluginId(), 0, Messages.SSHTargetControl_1, null));
-			}
-			kill(monitor);
-			connect(monitor);
-			if (monitor.isCanceled()) {
-				disconnect();
-				throw new CoreException(new Status(IStatus.CANCEL, getPluginId(), 0, Messages.SSHTargetControl_1, null));
-			}
-			return true;
-		} catch (RemoteConnectionException e) {
-			disconnect();
-			String message = e.getMessage();
-			Throwable t = e.getCause();
-			if (t != null) {
-				message += ": " + t.getMessage(); //$NON-NLS-1$
-			}
-			throw new CoreException(new Status(IStatus.ERROR, getPluginId(), message));
-		}
-	}
-
-	/**
-	 * Create the SSH connection to the remote target environment. First,
-	 * {@link #setConnectionParameters(org.eclipse.ptp.remotetools.environment.control.SSHTargetControl.SSHParameters)}
-	 * must be called.
-	 * 
-	 * @param monitor
-	 *            progress monitor
-	 * @throws RemoteConnectionException
-	 */
-	protected synchronized void connect(IProgressMonitor monitor) throws RemoteConnectionException {
-		Assert.isNotNull(sshParameters, "missing ssh parameters"); //$NON-NLS-1$
-		/*
-		 * Try to connect, else undo the connection.
-		 */
-		AuthToken authToken;
-		if (sshParameters.isPasswdAuth) {
-			authToken = new PasswdAuthToken(sshParameters.user, sshParameters.password);
-		} else {
-			authToken = new KeyAuthToken(sshParameters.user, new File(sshParameters.keyPath), sshParameters.passphrase);
-		}
-
-		if (remoteConnection == null) {
-			remoteConnection = RemotetoolsPlugin.createSSHConnection();
-		}
-		try {
-			remoteConnection.connect(authToken, sshParameters.hostname, sshParameters.port, sshParameters.cipherType,
-					sshParameters.timeout, monitor);
-		} catch (RemoteConnectionException e) {
-			disconnect();
-			throw e;
-		}
-	}
-
-	/**
-	 * Returns the plugin ID.
-	 * 
-	 * @return
-	 */
-	protected abstract String getPluginId();
-
-	/**
-	 * Destroy the remote target environment, by closing the SSH connection to
-	 * it.
-	 */
-	public boolean kill(IProgressMonitor monitor) throws CoreException {
-		/*
-		 * Try to gracefully terminate all running jobs. Might this fail, then
-		 * guarantee to disconnect.
-		 */
-		try {
-			terminateJobs(monitor);
-		} finally {
-			disconnect();
-		}
-		return true;
-	}
-
-	public boolean executeRemoteCommand(IProgressMonitor monitor, String command, String[] args) throws CoreException {
-		if (remoteConnection == null) {
-			throw new CoreException(new Status(IStatus.ERROR, getPluginId(), Messages.SSHTargetControl_5, null));
-		}
-
-		for (int i = 0; i < args.length; i++) {
-			command += (" " + args[i]); //$NON-NLS-1$
-		}
-
-		try {
-			IRemoteExecutionManager executionManager = remoteConnection.createRemoteExecutionManager();
-			executionManager.getExecutionTools().executeWithExitValue(command);
-			executionManager.close();
-			return true;
-		} catch (RemoteConnectionException e) {
-			throw new CoreException(new Status(IStatus.ERROR, getPluginId(), 0, Messages.SSHTargetControl_2, e));
-		} catch (CancelException e) {
-			throw new CoreException(new Status(IStatus.ERROR, getPluginId(), 0, Messages.SSHTargetControl_3, e));
-		} catch (RemoteExecutionException e) {
-			throw new CoreException(new Status(IStatus.ERROR, getPluginId(), 0, Messages.SSHTargetControl_4, e));
-		}
-	}
-
-	/**
-	 * Informs how to connect to a socket that is being listened on the remote
-	 * target environment. If necessary, create a tunnel that forwards the
-	 * remote port.
-	 * 
-	 * @return A {@link TargetSocket} object that encapsulates information where
-	 *         to connect in order to connect to the remote tunnel.
-	 */
-	public TargetSocket createTargetSocket(int port) throws CoreException {
-		/*
-		 * Dummy implementation that assumes that the remote port is mapped to
-		 * the same local port.
-		 */
-		TargetSocket test = new TargetSocket();
-		test.host = "localhost"; //$NON-NLS-1$
-		test.port = port;
-		return test;
-	}
-
-	/**
-	 * Checks if the connection to the remote target environment is alive.
-	 * 
-	 * @return
-	 */
-	protected boolean isConnected() {
-		return (remoteConnection != null) && (remoteConnection.isConnected());
-	}
-
-	protected synchronized void terminateJobs(IProgressMonitor monitor) {
-		/*
-		 * Issue each job to terminate gracefully.
-		 */
-		for (ITargetJob job : remoteJobs.keySet()) {
-			TargetControlledJob controlledJob = remoteJobs.get(job);
-			controlledJob.cancelExecution();
-		}
-
-		/*
-		 * Wait until all jobs have terminated.
-		 */
-		while (getJobCount() > 0) {
-			try {
-				wait(500);
-			} catch (InterruptedException e) {
-				return;
-			}
-			if (monitor != null) {
-				if (monitor.isCanceled()) {
-					return;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Guarantees that the connection to the remote host is closed and releases
-	 * ressources allocated to the connection.
-	 */
-	protected synchronized void disconnect() {
-		/*
-		 * Any still running jobs will fail.
-		 */
-		remoteJobs.clear();
-		if (remoteConnection != null) {
-			remoteConnection.disconnect();
-		}
-	}
-
-	/**
-	 * Create a remote execution manager that may be used to do operations on
-	 * the remote target environment.
-	 * 
-	 * @return
-	 * @throws RemoteConnectionException
-	 */
-	protected IRemoteExecutionManager createRemoteExecutionManager() throws RemoteConnectionException {
-		return remoteConnection.createRemoteExecutionManager();
-	}
-
-	public IRemoteConnection getConnection() {
-		Assert.isTrue(false, "this method is not supported"); //$NON-NLS-1$
-		return remoteConnection;
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/TargetControlledJob.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/TargetControlledJob.java
deleted file mode 100755
index e1f6949..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/control/TargetControlledJob.java
+++ /dev/null

@@ -1,95 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.control;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.environment.EnvironmentPlugin;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-
-
-/**
- * Standard implementation of <code>ITargetControlledJob</code>.
- * @see ITargetControlledJob
- * @author Daniel Felix Ferber
- * @since 1.2
- */
-class TargetControlledJob {
-	
-	protected static final int UNDEFINED = 0;
-	protected static final int RUNNING = 1;
-	protected static final int FINISHED = 2;
-	
-	JobRunner jobRunner;
-	IRemoteExecutionManager executionManager;
-	ITargetJob job;
-	SSHTargetControl targetControl;
-	int status = UNDEFINED;
-	
-	public TargetControlledJob(SSHTargetControl controller, ITargetJob job) throws CoreException {
-		super();
-		this.targetControl = controller;
-		this.job = job;
-		try {
-			this.executionManager = controller.createRemoteExecutionManager();
-		} catch (RemoteConnectionException e) {
-			CoreException ce = new CoreException(new Status(IStatus.ERROR,
-					EnvironmentPlugin.getUniqueIdentifier(), 0, e
-							.getLocalizedMessage(), e));
-			throw ce;
-		}
-		this.jobRunner = new JobRunner(this);
-	}
-
-	protected void start() {
-		jobRunner.start();
-	}
-	
-	protected class JobRunner extends Thread {
-		private TargetControlledJob controller;
-		
-		protected JobRunner(TargetControlledJob controller) {
-			this.controller = controller;
-		}
-		public void run() {
-			controller.targetControl.notifyStartingJob(job);
-			synchronized (controller) {
-				controller.status = RUNNING;
-			}
-			try {
-				job.run(controller.executionManager);
-			} finally {
-				synchronized (controller) {
-					controller.status = FINISHED;
-					controller.executionManager.close();
-					controller.targetControl.notifyFinishedJob(job);
-				}
-			}
-		}
-	}
-
-	public ITargetJob getJob() {
-		return job;
-	}
-
-	public synchronized boolean isFinished() {
-		return status == FINISHED;
-	}
-	
-	public synchronized void cancelExecution() {
-		if (status != FINISHED) {
-			executionManager.cancel();
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ChildrenProviderManager.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ChildrenProviderManager.java
deleted file mode 100644
index 8a47777..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ChildrenProviderManager.java
+++ /dev/null

@@ -1,76 +0,0 @@
-/**
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.core;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.ptp.remotetools.environment.extension.IChildrenProvider;
-import org.eclipse.ptp.remotetools.environment.extension.INode;
-import org.eclipse.ptp.utils.core.extensionpoints.IProcessMemberVisitor;
-import org.eclipse.ptp.utils.core.extensionpoints.ProcessExtensions;
-
-/**
- * Manage a list of <code>IChildrenProvider</code> contributed by extensions
- * 
- * @author Hong Chang Lin
- * 
- */
-public class ChildrenProviderManager {
-
-    private final static String EXT_PROVIDER_ID = "org.eclipse.ptp.remotetools.environment.core.childrenProvider"; //$NON-NLS-1$
-
-    private List<IChildrenProvider> providers;
-
-    public ChildrenProviderManager() {
-        processChildrenProviders();
-    }
-
-    public INode[] getChildren(ITargetElement targetElement) {
-        List<INode> children = new ArrayList<INode>();
-        for (IChildrenProvider provider : providers) {
-            INode[] objs = provider.getChildren(targetElement);
-            for (int i = 0; i < objs.length; i++) {
-                children.add(objs[i]);
-            }
-        }
-
-        return children.toArray(new INode[0]);
-    }
-    
-    private void processChildrenProviders() {
-        providers = new ArrayList<IChildrenProvider>();
-        ProcessExtensions.process(EXT_PROVIDER_ID, new IProcessMemberVisitor() {
-
-            public Object process(IExtension extension,
-                    IConfigurationElement member) {
-                Object mprovider;
-                try {
-
-                    mprovider = member.createExecutableExtension("class"); //$NON-NLS-1$
-                    if (IChildrenProvider.class.isAssignableFrom(mprovider
-                            .getClass())) {
-                        providers.add((IChildrenProvider) mprovider); //$NON-NLS-1$
-                    }
-                } catch (CoreException e) {
-                    mprovider = null;
-                }
-
-                return mprovider;
-            }
-
-        });
-    }
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetElement.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetElement.java
deleted file mode 100755
index abcf2df..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetElement.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.core;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControl;
-
-
-public interface ITargetElement {
-
-	public abstract Map<String, String> getAttributes();
-
-	public abstract void setAttributes(Map<String, String> attributes);
-
-	public abstract String getName();
-
-	public abstract void setName(String name);
-
-	public abstract ITargetControl getControl() throws CoreException;
-
-	public abstract TargetTypeElement getType();
-
-	public abstract int getStatus();
-
-	public abstract String toString();
-
-	public abstract String getId();
-
-}
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetElementStatus.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetElementStatus.java
deleted file mode 100755
index 5f2ae1b..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetElementStatus.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.core;
-
-/**
- * External status code definition for target generated events.
- * 
- * @author Ricardo M. Matinata, Richard Maciel
- * @since 1.1
- */
-public interface ITargetElementStatus {
-	
-	/**
-	 * The element has been successfully configured and is available (conected)
-	 * to the host machine.
-	 */
-	final public static int STARTED = 0;
-	
-	/**
-	 * The element is not conected to the host machine
-	 */
-	final public static int STOPPED = 1;
-	
-	/**
-	 * The element is in a state that allows applications to be run in it.
-	 */
-	final public static int RESUMED = 2;
-	
-	/**
-	 * The element is in a state that does not allow applications to be run in it,
-	 * although is conected (live) to the host machine.
-	 */
-	final public static int PAUSED  = 3;
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetEnvironmentEventListener.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetEnvironmentEventListener.java
deleted file mode 100755
index 070694a..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetEnvironmentEventListener.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.core;
-
-/**
- * Interface definition for targets' changes listerners.
- * Two kinds of events can occur:
- * <ul>
- * <il> Add: Element was added to the pool of targets
- * <il> Remove: Element was removed from the pool of targets
- * </ul>
- * 
- * @author Ricardo M. Matinata, Richard Maciel
- * @since 1.2
- *
- */
-public interface ITargetEnvironmentEventListener {
-	
-	public static int ADDED = 0;
-	
-	public static int REMOVED = 1;
-	
-	/**
-	 * Notifies that an element has just been added to the model
-	 * 
-	 * @param element the added element
-	 */
-	public void elementAdded(TargetElement element);
-	
-	/**
-	 * Notifies that an element has just been removed from the model
-	 * 
-	 * @param element the lement being removed
-	 */
-	public void elementRemoved(ITargetElement element);
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetEventListener.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetEventListener.java
deleted file mode 100755
index e92b298..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/ITargetEventListener.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.core;
-
-/**
- * Interface definition for targets' event listeners.
- * Events are fired when a target state changes.
- * 
- * @author Ricardo M. Matinata, Richard Maciel
- * @since 1.1
- */
-public interface ITargetEventListener {
-
-	/**
-	 * Notifies the listener that the event has occured.
-	 * 
-	 * @param event the event code as in org.eclipse.ptp.remotetools.environment.model.ITargetElementStatus
-	 * @param from the originating target element
-	 */
-	void handleStateChangeEvent(int event, ITargetElement from);
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetElement.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetElement.java
deleted file mode 100755
index 0401d29..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetElement.java
+++ /dev/null

@@ -1,152 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.core;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControl;
-import org.eclipse.ptp.remotetools.environment.control.ITargetStatus;
-
-
-/**
- * 
- * 
- * @author Ricardo M. Matinata
- * @since 1.1
- */
-public class TargetElement implements ITargetElement {
-
-	private TargetTypeElement type;
-	private Map<String, String> attributes;
-	private String name;
-	private String id;
-	private ITargetControl control;
-	private int status = ITargetStatus.STOPPED;
-	private boolean dirty = false;
-	
-	public TargetElement(TargetTypeElement type, String id) {
-		super();
-		this.type = type;
-		this.id = id;
-	}
-	
-	public TargetElement(TargetTypeElement type, String name, Map<String, String> attrs, String id) {
-		this(type, id);
-		this.attributes = attrs;
-		this.name = name;
-		this.type = type;
-	}
-	
-	public void update(Map<String, String> attr) {
-		try {
-			ITargetControl ctrl = getControl();
-			if (attr == null) {
-				ctrl.updateConfiguration();
-			} else {
-				ctrl.updateConfiguration();
-			}
-			dirty = false;
-		} catch (CoreException e) {
-			dirty = true;
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.core.ITargetElement#getAttributes()
-	 */
-	public Map<String, String> getAttributes() {
-		return attributes;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.core.ITargetElement#setAttributes(java.util.Map)
-	 */
-	public void setAttributes(Map<String, String> attributes) {
-		this.attributes = attributes;
-		if (getStatus() == ITargetStatus.STOPPED) {
-			update(attributes);
-		} else 
-			dirty = true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.core.ITargetElement#getName()
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.core.ITargetElement#setName(java.lang.String)
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.core.ITargetElement#getControl()
-	 */
-	public ITargetControl getControl() throws CoreException {
-		if (control == null) {
-			control = type.getExtension().controlFactory(this);
-		}
-		return control;
-	}
-
-	public void setControl(ITargetControl control) {
-		this.control = control;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.core.ITargetElement#getType()
-	 */
-	public TargetTypeElement getType() {
-		return type;
-	}
-
-	public void setType(TargetTypeElement type) {
-		this.type = type;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.core.ITargetElement#getStatus()
-	 */
-	public int getStatus() {
-		return status;
-	}
-
-	public void setStatus(int status) {
-		this.status = status;
-		if (status == ITargetStatus.STOPPED && dirty) {
-			update(getAttributes());
-			
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.core.ITargetElement#toString()
-	 */
-	public String toString() {
-		
-		return this.getName() != null ? this.getName() : super.toString();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.core.ITargetElement#getId()
-	 */
-	public String getId() {
-		return id;
-	}
-	
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetEnvironmentEventManager.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetEnvironmentEventManager.java
deleted file mode 100755
index 6d70dc2..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetEnvironmentEventManager.java
+++ /dev/null

@@ -1,127 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.core;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControl;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControlEventListener;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControlEventProvider;
-import org.eclipse.ptp.remotetools.environment.control.PoolingTargetControlEventProvider;
-
-
-/**
- * Manager class to support different event provider per each 
- * target control instance.
- * 
- * @author Ricardo M. Matinata
- * @since 1.2
- *
- */
-public class TargetEnvironmentEventManager implements ITargetControlEventListener, ITargetEnvironmentEventListener {
-	
-	private TargetEnvironmentManager model = null;
-	private ITargetControlEventProvider defaultProvider = new PoolingTargetControlEventProvider();
-	private Map controls = new HashMap();
-	
-	/**
-	 * Constructor
-	 */
-	public TargetEnvironmentEventManager(TargetEnvironmentManager model) {
-		this.model = model;
-		model.addModelChangedListener(this);
-	}
-	
-
-	public void handleStateChangeEvent(int event, ITargetControl from) {
-		
-		ControlInfo info = (ControlInfo) controls.get(from);
-		model.fireElementEvent(event, info.getElement());
-		
-	}
-	
-	public void elementAdded(TargetElement element) {
-		
-		try {
-			ITargetControl control = element.getControl();
-			ITargetControlEventProvider provider = null;
-			
-			if(IAdaptable.class.isAssignableFrom(control.getClass())) {
-				provider = (ITargetControlEventProvider) ((IAdaptable)control).getAdapter(ITargetControlEventProvider.class);
-			}
-			
-			if (provider == null) {
-				provider = defaultProvider;
-			}
-			
-			controls.put(control, new ControlInfo(element,provider));
-			provider.registerControlAndListener(control,this);
-			
-		} catch (CoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		
-		
-	}
-
-
-	public void elementRemoved(ITargetElement element) {
-		
-		try {
-			
-			ITargetControl control = element.getControl();
-			ControlInfo info = (ControlInfo) controls.get(control);
-			ITargetControlEventProvider provider = info.getProvider();
-			provider.unregisterControlAndListener(control,this);
-			controls.remove(control);
-			
-		} catch (CoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		
-	}
-	
-	class ControlInfo {
-		
-		private TargetElement element;
-		private ITargetControlEventProvider provider;
-		
-		public ControlInfo(TargetElement element, ITargetControlEventProvider provider) {
-			this.element = element;
-			this.provider = provider;
-		}
-		
-		public TargetElement getElement() {
-			return element;
-		}
-		
-		public void setElement(TargetElement element) {
-			this.element = element;
-		}
-		
-		public ITargetControlEventProvider getProvider() {
-			return provider;
-		}
-		
-		public void setProvider(ITargetControlEventProvider provider) {
-			this.provider = provider;
-		}
-		
-	}
-
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetEnvironmentManager.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetEnvironmentManager.java
deleted file mode 100755
index 9e12b4e..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetEnvironmentManager.java
+++ /dev/null

@@ -1,396 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.core;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.ListenerList;
-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.remotetools.environment.EnvironmentPlugin;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControl;
-import org.eclipse.ptp.remotetools.environment.control.ITargetStatus;
-import org.eclipse.ptp.remotetools.environment.extension.ITargetTypeExtension;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.WorkbenchException;
-import org.eclipse.ui.XMLMemento;
-
-/**
- * Class responsible for managing all Targets available. Its managing tasks consist on:
- * <ul>
- * <li> Read/write targets information from/to disk (sensitive data is written to a secure container)
- * <li> Keep a list of all target types elements based on extension point information. Each target type can reference a list of target elements
- * <li> Insert/remove listeners for targets events.
- * <li> Fire events for the listeners
- * <li> Provides getters for configs
- * 
- * @author Ricardo M. Matinata, Richard Maciel
- * @since 1.1
- */
-public class TargetEnvironmentManager {
-
-	private static String ENVIRONMENTS = "Environments"; //$NON-NLS-1$
-	private static String ENVIRONMENTS_TYPE = "Type"; //$NON-NLS-1$
-	private static String ENVIRONMENTS_TYPE_NAME = "Name"; //$NON-NLS-1$
-	private static String ENVIRONMENTS_TYPE_CONFIG = "Configuration"; //$NON-NLS-1$
-	private static String ENVIRONMENTS_TYPE_CONFIG_NAME = "CfgName"; //$NON-NLS-1$
-	
-	private List<TargetTypeElement> targetTypeElements = new ArrayList<TargetTypeElement>();
-	private ListenerList eventListeners = new ListenerList();
-	private ListenerList modelChangedListeners = new ListenerList();
-	
-	private Map<String, Set<String>> storedCypherEnvToKeyMap;
-	
-	
-	public TargetEnvironmentManager() {
-		
-		super();
-		
-		new TargetEnvironmentEventManager(this);
-		
-		Map<String, ITargetTypeExtension> targets = EnvironmentPlugin.getDefault().getControls();
-		ISecurePreferences cypherEnvTypeMap = SecurePreferencesFactory.getDefault();
-		
-		// Create a map that contains (environment type name, cipher key set) tuples
-		storedCypherEnvToKeyMap = new HashMap<String, Set<String>>();
-			
-		File file = EnvironmentPlugin.getDefault().getStateLocation().append(EnvironmentPlugin.FILENAME).toFile();
-		if (file.exists()) {
-			try {
-				FileReader reader = new FileReader(file);
-				XMLMemento memento = XMLMemento.createReadRoot(reader);
-				targets = initContentFromFile(memento, targets, cypherEnvTypeMap);
-			} catch (FileNotFoundException e) {
-				throw new RuntimeException(e);
-			} catch (WorkbenchException e) {
-				throw new RuntimeException(e);
-			}
-		}
-		
-		Set<String> cipherKeySet = new HashSet<String>();
-		for (String name : targets.keySet()) {
-			ITargetTypeExtension env = targets.get(name);
-			targetTypeElements.add(new TargetTypeElement(name,env,this));
-			
-			// Also save the ciphered key names
-			// Get cryptographed keys
-			String [] controlKeysCypher = env.getControlAttributeNamesForCipheredKeys();
-			
-			// Add all key names to the set
-			if(controlKeysCypher != null) {
-				List<String> keyList = Arrays.asList(controlKeysCypher);
-				cipherKeySet.addAll(keyList);
-			}
-			
-//			 Add set to the map (save it)
-			storedCypherEnvToKeyMap.put(name, cipherKeySet);
-		}
-		
-	}
-	
-	public Map<String, ITargetTypeExtension> initContentFromFile(XMLMemento memento, 
-			Map<String, ITargetTypeExtension> targets, ISecurePreferences cypherEnvTypeMap) {
-		
-		IMemento[] children = memento.getChildren(ENVIRONMENTS_TYPE);
-		for (int i = 0; i < children.length; i++) {
-			String name = children[i].getString(ENVIRONMENTS_TYPE_NAME);
-			ITargetTypeExtension env = targets.get(name);
-			// Get config name map from the given type name.
-			ISecurePreferences cypherConfigNameMap = null;
-			// Set null if the parent map is null.
-			if(cypherEnvTypeMap != null) cypherConfigNameMap = cypherEnvTypeMap.node(name);
-			if (env != null) {
-//				 Create cipher key set that will contain the name of the keys that are ciphered
-				Set<String> cipherKeySet = new HashSet<String>();
-				
-//				 Get cryptographed keys
-				String [] controlKeysCypher = env.getControlAttributeNamesForCipheredKeys();
-				
-				// Add all key names to the set
-				if(controlKeysCypher != null) {
-					List<String> keyList = Arrays.asList(controlKeysCypher);
-					cipherKeySet.addAll(keyList);
-				}
-				
-//				 Add set to the map
-				storedCypherEnvToKeyMap.put(name, cipherKeySet);
-				
-				TargetTypeElement typeElement = new TargetTypeElement(name,env,this);
-				IMemento[] childrenElements = children[i].getChildren(ENVIRONMENTS_TYPE_CONFIG);
-				for (int j = 0; j < childrenElements.length; j++) {
-					String nameElement = childrenElements[j].getString(ENVIRONMENTS_TYPE_CONFIG_NAME);
-					
-					Map<String,String> attrsElement = new HashMap<String,String>();
-					String[] controlKeys = env.getControlAttributeNames();
-					for (int k = 0; k < controlKeys.length; k++) {
-						attrsElement.put(controlKeys[k],childrenElements[j].getString(controlKeys[k]));
-					}
-					
-					// Get password key map from the given configuration name
-					ISecurePreferences cypherPasswdKeyMap = null;
-					// Set null if the parent map is null
-					if(cypherConfigNameMap != null) cypherPasswdKeyMap = cypherConfigNameMap.node(nameElement);
-					
-					if(controlKeysCypher != null) {
-						for(int k=0; k < controlKeysCypher.length; k++) {
-							// Insert into key into the hash set to f
-							// Get the passwords or set them to empty string, if map not available.
-							if(cypherPasswdKeyMap == null) {
-								attrsElement.put(controlKeysCypher[k], ""); //$NON-NLS-1$
-							} else {
-								try {
-									attrsElement.put(controlKeysCypher[k], cypherPasswdKeyMap.get(controlKeysCypher[k], "")); //$NON-NLS-1$
-								} catch (StorageException e) {
-									attrsElement.put(controlKeysCypher[k], ""); //$NON-NLS-1$
-								}
-							}
-							// Include key name in the set
-							cipherKeySet.add(controlKeysCypher[k]);
-						}
-					}
-					
-					// Finally insert the identifier of the environment
-					// Create it, if necessary.
-					String id;
-					if(childrenElements[j].getString(EnvironmentPlugin.ATTR_CORE_ENVIRONMENTID) == null) {
-						id = EnvironmentPlugin.getDefault().getEnvironmentUniqueID();
-						/*attrsElement.put(EnvironmentPlugin.ATTR_CORE_ENVIRONMENTID, 
-								EnvironmentPlugin.getDefault().getEnvironmentUniqueID());*/
-					} else {
-						id = childrenElements[j].getString(EnvironmentPlugin.ATTR_CORE_ENVIRONMENTID);
-						/*attrsElement.put(EnvironmentPlugin.ATTR_CORE_ENVIRONMENTID, 
-							childrenElements[j].getString(EnvironmentPlugin.ATTR_CORE_ENVIRONMENTID));*/
-					}
-					
-					typeElement.addElement(new TargetElement(typeElement,nameElement,attrsElement, id));
-				}
-				
-				targetTypeElements.add(typeElement);
-				targets.remove(name);
-			}
-		}
-		
-		return targets;
-		
-	}
-	
-	public void writeToFile() throws StorageException {
-		
-		// Create new ciphered Environment type map
-		ISecurePreferences cypherEnvTypeMap = SecurePreferencesFactory.getDefault();
-		
-		File file = EnvironmentPlugin.getDefault().getStateLocation().append(EnvironmentPlugin.FILENAME).toFile();
-		XMLMemento memento = XMLMemento.createWriteRoot(ENVIRONMENTS);		
-		for (TargetTypeElement type : targetTypeElements) {
-		    IMemento typeMemento = memento.createChild(ENVIRONMENTS_TYPE);
-		    typeMemento.putString(ENVIRONMENTS_TYPE_NAME, type.getName());
-			
-		    // Create new ciphered configuration map
-		    ISecurePreferences cypherConfigNameMap = cypherEnvTypeMap.node(type.getName());
-		    
-		    // Get set of ciphered keys for this environment type name
-		    Set<String> cypherKeySet = storedCypherEnvToKeyMap.get(type.getName());
-		    
-		    for (ITargetElement element : type.getElements()) {
-				IMemento elementMemento = typeMemento.createChild(ENVIRONMENTS_TYPE_CONFIG);
-				elementMemento.putString(ENVIRONMENTS_TYPE_CONFIG_NAME,element.getName());
-				
-				Map<String, String> elementAttr = element.getAttributes();
-				
-				// Create new ciphered password key map
-				ISecurePreferences cypherPasswdKeyMap = cypherConfigNameMap.node(element.getName());
-				
-				for (String key : elementAttr.keySet()) {
-					// If is ciphered put it as a value to the ciphered password key map
-					if(cypherKeySet.contains(key)) {
-						cypherPasswdKeyMap.put(key, (String) elementAttr.get(key), true);
-					} else {
-						elementMemento.putString(key,(String) elementAttr.get(key));
-					}
-				}
-				
-				// Save the Target id from the Target Element.
-				elementMemento.putString(EnvironmentPlugin.ATTR_CORE_ENVIRONMENTID,
-						element.getId());
-			
-			}
-		}
-		
-		Writer writer;
-		try {
-			writer = new FileWriter(file);
-			memento.save(writer);
-		} catch (IOException e) {
-			// This should not happen. Throw a runtime exception
-			throw new RuntimeException(e);
-		}
-		
-	}
-
-	public List<TargetTypeElement> getTypeElements() {
-		return targetTypeElements;
-	}
-	
-	public synchronized ITargetElement[] getConfigElements() {
-		List<ITargetElement> rsp = new ArrayList<ITargetElement>();
-		for (TargetTypeElement element : targetTypeElements) {
-			rsp.addAll( element.getElements() );
-		}
-		
-		ITargetElement[] rspObj = null;
-		
-		if (rsp.size() > 0) {
-			rspObj = (ITargetElement[])rsp.toArray(new ITargetElement[]{});
-		}
-		return rspObj;
-		
-	}
-	
-	/**
-	 * Registers a model event listener. If the listener argument is null or already registered, this 
-	 * method has no effect.
-	 */
-	
-	public synchronized void addModelEventListener (ITargetEventListener listener)
-	{
-		if (listener != null)
-		{
-			eventListeners.add (listener);
-		}
-	}
-	
-	/**
-	 * De-registers a model event listener. If the listener argument is null or not already registered, this 
-	 * method has no effect.
-	 */
-
-	public synchronized void removeModelEventListener (ITargetEventListener listener)
-	{
-		if (listener != null)
-		{
-			eventListeners.remove (listener);
-		}
-	}
-	
-	/**
-	 * Registers a model changed listener. If the listener argument is null or already registered, this 
-	 * method has no effect.
-	 */
-	
-	public synchronized void addModelChangedListener (ITargetEnvironmentEventListener listener)
-	{
-		if (listener != null)
-		{
-			modelChangedListeners.add (listener);
-		}
-	}
-	
-	/**
-	 * De-registers a model changed listener. If the listener argument is null or not already registered, this 
-	 * method has no effect.
-	 */
-
-	public synchronized void removeModelChangedListener (ITargetEnvironmentEventListener listener)
-	{
-		if (listener != null)
-		{
-			modelChangedListeners.remove (listener);
-		}
-	}
-
-	public void fireModelChanged(int action,ITargetElement oldElement,TargetElement newElement) {
-		
-		if (oldElement == null && newElement != null) {
-			for (Object listener : modelChangedListeners.getListeners()) {
-				((ITargetEnvironmentEventListener)listener).elementAdded(newElement);
-			}
-		} else if (oldElement != null && newElement == null) {
-			for (Object listener : modelChangedListeners.getListeners()) {
-				((ITargetEnvironmentEventListener)listener).elementRemoved(oldElement);
-			}
-		}
-		
-	}
-	
-	public synchronized void fireElementEvent(int event,TargetElement element) {
-
-		int status = ITargetElementStatus.STOPPED;
-		switch (event) {
-			case ITargetStatus.STARTED:
-				status = ITargetElementStatus.STARTED;
-				break;
-			case ITargetStatus.STOPPED:
-				status = ITargetElementStatus.STOPPED;
-				break;
-			case ITargetStatus.RESUMED:
-				status = ITargetElementStatus.RESUMED;
-				break;
-			case ITargetStatus.PAUSED:
-				status = ITargetElementStatus.PAUSED;
-				break;
-		}
-		element.setStatus(status);
-		
-		for (Object listener : eventListeners.getListeners()) {
-			((ITargetEventListener)listener).handleStateChangeEvent(status, element);
-		}
-	}
-	
-	// Implementation of methods from the ITargetProvider
-	
-	public ITargetControl selectControl(String id) {
-		ITargetElement[] elements = getConfigElements();
-		if (elements != null) {
-			for (int i = 0; i < elements.length; i++)
-			{
-				ITargetElement element = elements [i];
-				if (element.getName().equals(id)) {
-					try {
-						return element.getControl();
-					} catch (CoreException e) {
-						
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-	public String[] getAllConfigNames() {
-		ITargetElement[] elements = getConfigElements();
-		List<String> names = new ArrayList<String>();
-		if (elements != null) {
-			for (int i = 0; i < elements.length; i++)
-			{
-				ITargetElement element = elements [i];
-				names.add(element.getName());
-			}
-		}
-		
-		return (String[]) names.toArray(new String[]{});
-	}
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetTypeElement.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetTypeElement.java
deleted file mode 100755
index c909ba6..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/TargetTypeElement.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.core;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.ptp.remotetools.environment.extension.ITargetTypeExtension;
-
-
-/**
- * 
- * @author Ricardo M. Matinata
- * @since 1.1
- */
-public class TargetTypeElement {
-
-	private String name;
-	private TargetEnvironmentManager manager;
-	private ITargetTypeExtension extension;
-	private List<ITargetElement> elements = new ArrayList<ITargetElement>();
-	
-	public TargetTypeElement(String name,ITargetTypeExtension env,TargetEnvironmentManager model) {
-		super();
-		this.name = name;
-		this.extension = env;
-		this.manager = model;
-		
-	}
-
-	public List<ITargetElement> getElements() {
-		return elements;
-	}
-
-	public void addElement(TargetElement element) {
-		this.elements.add(element);
-		manager.fireModelChanged(ITargetEnvironmentEventListener.ADDED, null, element);
-	}
-	
-	public void removeElement(ITargetElement element) {
-		this.elements.remove(element);
-		manager.fireModelChanged(ITargetEnvironmentEventListener.REMOVED, element, null);
-	}
-
-	public ITargetTypeExtension getExtension() {
-		return extension;
-	}
-
-	public void setExtension(ITargetTypeExtension extension) {
-		this.extension = extension;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String toString() {
-		
-		return this.getName() != null ? this.getName() : super.toString();
-	}
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/messages/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/messages/Messages.java
deleted file mode 100644
index 95ff469..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/messages/Messages.java
+++ /dev/null

@@ -1,21 +0,0 @@
-package org.eclipse.ptp.remotetools.environment.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remotetools.environment.core.messages.messages"; //$NON-NLS-1$
-	public static String PoolingTargetControlEventProvider_0;
-	public static String SSHTargetControl_0;
-	public static String SSHTargetControl_1;
-	public static String SSHTargetControl_2;
-	public static String SSHTargetControl_3;
-	public static String SSHTargetControl_4;
-	public static String SSHTargetControl_5;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/messages/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/messages/messages.properties
deleted file mode 100644
index 0d2b8d8..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/core/messages/messages.properties
+++ /dev/null

@@ -1,7 +0,0 @@
-PoolingTargetControlEventProvider_0=Target Control polling
-SSHTargetControl_0=Target not ready to execute jobs
-SSHTargetControl_1=Connection to target canceled
-SSHTargetControl_2=Failed to connect with remote target environment
-SSHTargetControl_3=Cancelled execution on remote target environment
-SSHTargetControl_4=Failed to execute on remote target environment
-SSHTargetControl_5=Internal error: remote connection invalid

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/IChildrenProvider.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/IChildrenProvider.java
deleted file mode 100644
index dcd2170..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/IChildrenProvider.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/**
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.extension;
-
-import org.eclipse.ptp.remotetools.environment.core.ITargetElement;
-
-/**
- * The interface to manage the children hierarchies of a target element
- * 
- * @author Hong Chang Lin
- * 
- */
-public interface IChildrenProvider {
-
-    /**
-     * Return all the child objects of an ITargetElement
-     * 
-     * @param
-     * @return
-     */
-    public INode[] getChildren(ITargetElement targetElement);
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/INode.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/INode.java
deleted file mode 100644
index 764cc74..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/INode.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/**
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.extension;
-
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Represents the children of the ITargetElement's children on
- * RemoteToolsEnvironmentView
- * 
- * @author Hong Chang Lin
- * 
- */
-public interface INode {
-
-    /**
-     * @return all the children element
-     */
-    public INode[] getChildren();
-
-    /**
-     * @return the parent element
-     */
-    public Object getParent();
-
-    /**
-     * @return the display icon
-     */
-    public Image getIcon();
-
-    /**
-     * @return the display name
-     */
-    public String getDisplayText();
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/ITargetTypeExtension.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/ITargetTypeExtension.java
deleted file mode 100755
index be86e3b..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/ITargetTypeExtension.java
+++ /dev/null

@@ -1,76 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.extension;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControl;
-import org.eclipse.ptp.remotetools.environment.core.ITargetElement;
-import org.eclipse.ptp.remotetools.environment.wizard.AbstractEnvironmentDialogPage;
-
-/**
- * Provides an interface that is an extension of a target type. This extension
- * must be implemented by each plugin that extends the Environment Control
- * Delegate extension point, in order to define a new target type.
- * 
- * @author Ricardo M. Matinata, Richard Maciel
- * @since 1.1
- */
-public interface ITargetTypeExtension {
-
-	/**
-	 * Given the attributes, produces a fresh new control instance.
-	 * 
-	 * @param element
-	 *            TODO
-	 * 
-	 * @return the control instance
-	 */
-	ITargetControl controlFactory(ITargetElement element) throws CoreException;
-
-	/**
-	 * Provides an array with all the attributes' name needed by the associated
-	 * controlFactory. Only non-ciphered attributes are listed here.
-	 * 
-	 * @return an array of attributes' name
-	 */
-	String[] getControlAttributeNames();
-
-	/**
-	 * Provides a Dialog Page to edit the associated control's attributes This
-	 * should be used to edit an existent target environment
-	 * 
-	 * @param attributes
-	 *            the attributes' map. May be null in the case of a new
-	 *            configuration.
-	 * @param name
-	 *            the configuration's key name. May be null in the case of a new
-	 *            configuration.
-	 * @return an wizard page
-	 */
-	AbstractEnvironmentDialogPage dialogPageFactory(ITargetElement targetElement);
-
-	/**
-	 * Provides a Dialog Page to edit the associated control's attributes This
-	 * should be used when a new Target Environment is created
-	 * 
-	 * @return an wizard page
-	 */
-	AbstractEnvironmentDialogPage dialogPageFactory();
-
-	/**
-	 * Provides an array with all the attributes' name needed by the associated
-	 * controlFactory. Only ciphered attributes are listed here.
-	 * 
-	 * @return an array of attributes' name
-	 */
-	String[] getControlAttributeNamesForCipheredKeys();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/ITargetVariables.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/ITargetVariables.java
deleted file mode 100755
index ddb1cf8..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/extension/ITargetVariables.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.extension;
-
-/**
- * Interface that provides support for resolution
- * of variables on each environment type. This interface must
- * be implemented by each plugin that extends the 
- * <extension point name here> extension point
- * 
- * @author Richard Maciel
- *
- */
-public interface ITargetVariables {
-	public String getSystemWorkspace();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/AbstractEnvironmentDialogPage.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/AbstractEnvironmentDialogPage.java
deleted file mode 100755
index d7b1918..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/AbstractEnvironmentDialogPage.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.wizard;
-
-import java.util.Map;
-
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * 
- * @author Ricardo M. Matinata
- * @since 1.1
- */
-public abstract class AbstractEnvironmentDialogPage extends WizardPage {
-
-	public AbstractEnvironmentDialogPage(String pageName) {
-		super(pageName);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	abstract public void createControl(Composite parent);
-
-	final public boolean canFinish() {
-		String name = getName();
-		if (name != null) {
-			if (!name.equals("")) {  //$NON-NLS-1$
-				return isValid();
-			}
-
-		}
-		return false;
-	}
-
-	/**
-	 * Should return the configuration's map derived from populating this own
-	 * page. null is not allowed.
-	 * 
-	 * @return the configuration attributes map
-	 */
-	abstract public Map getAttributes();
-
-	/**
-	 * Provides this configuration instance key name.
-	 * 
-	 * @returns the configuration's name
-	 */
-	abstract public String getName();
-
-	/**
-	 * Returns weather this current page information represents a valid state of
-	 * configuration.
-	 * 
-	 * @return true if valid, false otherwise.
-	 */
-	abstract public boolean isValid();
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/DialogMessages.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/DialogMessages.java
deleted file mode 100755
index efe828d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/DialogMessages.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.wizard;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * 
- * @author Ricardo M. Matinata
- * @since 1.3
- */
-public class DialogMessages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remotetools.environment.wizard.DialogMessages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(BUNDLE_NAME);
-
-	private DialogMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/DialogMessages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/DialogMessages.properties
deleted file mode 100755
index fb552b5..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/DialogMessages.properties
+++ /dev/null

@@ -1,14 +0,0 @@
-###############################################################################
-# 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
-# 
-# Contributors:
-#     IBM Corporation - Initial Implementation
-###############################################################################
-
-EnvironmentWizard.0=Target Environment Configuration
-EnvironmentWizard.1=Configuration name already exists
-EnvironmentWizard.2=Invalid configuration name

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/EnvironmentWizard.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/EnvironmentWizard.java
deleted file mode 100755
index 8e9584a..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/environment/wizard/EnvironmentWizard.java
+++ /dev/null

@@ -1,126 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.wizard;
-
-import java.util.Map;
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ptp.remotetools.environment.EnvironmentPlugin;
-import org.eclipse.ptp.remotetools.environment.core.ITargetElement;
-import org.eclipse.ptp.remotetools.environment.core.TargetElement;
-import org.eclipse.ptp.remotetools.environment.core.TargetTypeElement;
-
-/**
- * 
- * @author Ricardo M. Matinata
- * @since 1.1
- */
-public class EnvironmentWizard extends Wizard {
-
-	TargetTypeElement typeElement;
-	ITargetElement targetElement;
-	String originalKey = ""; //$NON-NLS-1$
-	boolean cancel = false;
-
-	/**
-	 * 
-	 */
-	public EnvironmentWizard(TargetTypeElement element) {
-		super();
-		this.typeElement = element;
-	}
-
-	public EnvironmentWizard(ITargetElement element) {
-		super();
-		this.typeElement = element.getType();
-		this.targetElement = element;
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.jface.wizard.IWizard#addPages()
-	 */
-	@Override
-	public void addPages() {
-		super.addPages();
-		this.setWindowTitle(DialogMessages.getString("EnvironmentWizard.0")); //$NON-NLS-1$
-		// Map attributes = null;
-		if (targetElement != null) {
-			// attributes = new HashMap(targetElement.getAttributes());
-			originalKey = targetElement.getName();
-		}
-		// AbstractEnvironmentDialogPage page =
-		// typeElement.getExtension().dialogPageFactory(attributes,originalKey);
-		AbstractEnvironmentDialogPage page;
-		if (targetElement != null) {
-			page = typeElement.getExtension().dialogPageFactory(targetElement);
-		} else {
-			page = typeElement.getExtension().dialogPageFactory();
-		}
-		addPage(page);
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.jface.wizard.Wizard#performFinish()
-	 */
-	@Override
-	public boolean performFinish() {
-		if (!cancel) {
-			AbstractEnvironmentDialogPage page = ((AbstractEnvironmentDialogPage) getStartingPage());
-			Map attributes = page.getAttributes();
-
-			if (attributes == null)
-				return false;
-
-			if (targetElement == null) {
-				String id = EnvironmentPlugin.getDefault().getEnvironmentUniqueID();
-				typeElement.addElement(new TargetElement(typeElement, page.getName(), attributes, id));
-			} else {
-				targetElement.setAttributes(attributes);
-				targetElement.setName(page.getName());
-			}
-		}
-		return true;
-	}
-
-	@Override
-	public boolean performCancel() {
-		this.cancel = true;
-		return true;
-	}
-
-	/**
-	 * 
-	 * @see org.eclipse.jface.wizard.IWizard#canFinish()
-	 */
-	@Override
-	public boolean canFinish() {
-
-		AbstractEnvironmentDialogPage page = ((AbstractEnvironmentDialogPage) getStartingPage());
-		page.setErrorMessage(null);
-		if (!page.getName().equals(originalKey)) {
-			if (page.getName() != null) {
-				if (!(EnvironmentPlugin.getDefault().getTargetsManager().selectControl(page.getName()) == null)) {
-					page.setErrorMessage(DialogMessages.getString("EnvironmentWizard.1")); //$NON-NLS-1$
-					return false;
-				}
-			} else {
-				page.setErrorMessage(DialogMessages.getString("EnvironmentWizard.2")); //$NON-NLS-1$
-				return false;
-			}
-		}
-
-		return page.canFinish();
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/AttributeVerification.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/AttributeVerification.java
deleted file mode 100644
index 35b48c0..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/AttributeVerification.java
+++ /dev/null

@@ -1,294 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.utils.verification;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileInfo;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.filesystem.URIUtil;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-
-public class AttributeVerification {
-	
-	public static IStatus createStatus(String pluginID, Throwable e, int severity,
-			String attributeName, String message, String value) {
-		if (value == null) {
-			value = Messages.AttributeVerification_NoValue;
-		}
-		String errorMessage = NLS.bind(Messages.AttributeVerification_ErrorMessage, new String[] { attributeName, message, value});
-		return new Status(IStatus.ERROR, pluginID, 0,
-				errorMessage, e);
-	}
-	
-	/**
-	 * Generic convenience method for raising core exception for errors.
-	 * 
-	 * @param pluginID
-	 *            see CoreException
-	 * @param e
-	 *            see CoreException
-	 * @param attributeName
-	 *            see CoreException
-	 * @param message
-	 *            see CoreException
-	 * @param value
-	 *            see CoreException
-	 * @throws CoreException
-	 */
-	public static void throwAttributeException(String pluginID, Throwable e,
-			String attributeName, String message, String value)
-			throws CoreException {
-		throw new CoreException(createStatus(pluginID, e, IStatus.ERROR, attributeName, message, value));
-	}
-
-	/**
-	 * Generic convenience method for raising core exception for errors.
-	 * 
-	 * @param pluginID
-	 *            see CoreException
-	 * @param attributeName
-	 *            see CoreException
-	 * @param message
-	 *            see CoreException
-	 * @param value
-	 *            see CoreException
-	 * @throws CoreException
-	 */
-	public static void throwAttributeException(String pluginID,
-			String attributeName, String message, String value)
-			throws CoreException {
-		throwAttributeException(pluginID, (Throwable) null, attributeName,
-				message, value);
-	}
-
-	String pluginID = null;
-
-	public AttributeVerification(String pluginID) {
-		super();
-		this.pluginID = pluginID;
-	}
-
-	/**
-	 * Throws a CoreException for the plug-in associated with this instance of
-	 * AttributeVerification.
-	 * 
-	 * @param e
-	 *            see CoreException
-	 * @param attributeName
-	 *            see CoreException
-	 * @param message
-	 *            see CoreException
-	 * @param value
-	 *            see CoreException
-	 * @throws CoreException
-	 *             see CoreException
-	 */
-	public void throwAttributeException(Throwable e,
-			String attributeName, String message, String value)
-			throws CoreException {
-		if (value == null) {
-			value = Messages.AttributeVerification_NoValue;
-		}
-		String errorMessage = NLS.bind(Messages.AttributeVerification_ErrorMessage, new String[] { attributeName, message, value});
-		throw new CoreException(new Status(IStatus.ERROR, pluginID, 0,
-				errorMessage, e));
-	}
-
-	/**
-	 * Throws a CoreException for the plug-in associated with this instance of
-	 * AttributeVerification.
-	 * 
-	 * @param attributeName
-	 *            see CoreException
-	 * @param message
-	 *            see CoreException
-	 * @param value
-	 *            see CoreException
-	 * @throws CoreException
-	 *             see CoreException
-	 */
-	public void throwAttributeException(String attributeName, String message, String value) throws CoreException {
-		throwAttributeException((Throwable)null, attributeName, message, value);
-	}
-
-	/**
-	 * If the string represents a valid parsable path, returns this path.
-	 * @param attributeName Name of the attribute
-	 * @param stringValue String that represents the path
-	 * @param pathType Class used to create path
-	 * @return The path represented by the string
-	 * @throws CoreException
-	 */
-	public IPath verifyPath(String attributeName, String stringValue) throws CoreException {
-		IPath path = new Path(stringValue);
-		
-		// Verify path
-		// Very strange design for IPath interface for testing validity.
-		if (! path.isValidPath(stringValue)) {
-			throwAttributeException(attributeName, Messages.AttributeVerification_InvalidPath, stringValue);
-		}
-		
-		return path;
-	}
-	
-	public static final int EXIST = 1;
-	public static final int WRITEABLE = 2;
-	public static final int DIRECTORY = 4;
-	public static final int EXECUTABLE = 8;
-	public static final int FILE = 16;
-	public static final int EXISTING_FILE = EXIST | FILE;
-	public static final int EXISTING_EXECUTABLE = EXIST | FILE | EXECUTABLE;
-	public static final int EXISTING_DIRECTORY = EXIST | DIRECTORY;
-	
-	public IStatus checkPath(String attributeName, IPath path) {
-		return checkPath(attributeName, path, IStatus.ERROR, EXIST);
-	}
-			
-	public IStatus checkPath(String attributeName, IPath path, int severity) {
-		return checkPath(attributeName, path, severity, EXIST);
-	}
-	
-	public IStatus checkPath(String attributeName, IPath path, int severity, int options) {
-		/*
-		 * Path must be absolute for safe check, if not, would check against
-		 * some unknown current working directory.
-		 */
-		if (! path.isAbsolute()) {
-			return createStatus(pluginID, null, severity, attributeName, Messages.AttributeVerification_NotAnAbsolutePath, path.toOSString());
-		}
-
-		URI uri = URIUtil.toURI(path);
-		IFileStore file;
-		try {
-			file = EFS.getStore(uri);
-		} catch (CoreException e) {
-			return e.getStatus();
-		}
-		
-		IFileInfo info = file.fetchInfo();
-		
-		if ((options & EXIST) != 0) {
-			if (! info.exists()) {
-				return createStatus(pluginID, null, severity, attributeName, Messages.AttributeVerification_PathDoesNotExist, path.toOSString());
-			}
-		}
-		
-		if ((options & DIRECTORY) != 0) {
-			if (! info.isDirectory()) {
-				return createStatus(pluginID, null, severity, attributeName, Messages.AttributeVerification_PathIsNotDir, path.toOSString());			
-			}
-		}
-
-		if ((options & EXECUTABLE) != 0) {
-			/*
-			 * On PPC, it is known that the EFS.ATTRIBUTE_EXECUTABLE is never set,
-			 * event if the path is an executable fiel.
-			 */
-			if (Platform.getOSArch().equals(Platform.ARCH_PPC)) {
-				// Simple ignore and assume it is an executable.
-			} else {
-				if (! info.getAttribute(EFS.ATTRIBUTE_EXECUTABLE)) {
-					return createStatus(pluginID, null, severity, attributeName, Messages.AttributeVerification_PathIsNotExecutableFile, path.toOSString());
-				}
-			}
-		}
-
-		if ((options & WRITEABLE) != 0) {
-			if (info.getAttribute(EFS.ATTRIBUTE_READ_ONLY)) {
-				return createStatus(pluginID, null, severity, attributeName, Messages.AttributeVerification_PathIsNotWritable, path.toOSString());
-			}
-		}
-		
-		if ((options & FILE) != 0) {
-			if (info.isDirectory()) {
-				return createStatus(pluginID, null, severity, attributeName, Messages.AttributeVerification_PathIsNotFile, path.toOSString());
-			}
-		}
-		
-		return null;
-	}
-	
-	public IPath verifyPluginRelativePath(String attributeName, Plugin plugin, IPath path) throws CoreException {
-		if (path.isAbsolute()) {
-			return path;
-		} else {
-			URL url = FileLocator.find(plugin.getBundle(), path, null);
-			if (url == null) {
-				throwAttributeException(attributeName, Messages.AttributeVerification_PathNotFound, path.toOSString());
-			}
-			try {
-				url = FileLocator.resolve(url);
-				URI uri = new URI(url.toString());
-				File file = new File(uri);
-				return new Path(file.getAbsolutePath());
-			} catch (IOException e1) {
-				throwAttributeException(attributeName, Messages.AttributeVerification_PathNotFound, path.toOSString());
-			} catch (URISyntaxException e) {
-				throwAttributeException(attributeName, Messages.AttributeVerification_MustBeLocalFile, path.toOSString());
-			}
-		}
-		return null;
-	}
-	
-//	public IPath verifyWorkspaceRelativePath(String attributeName, Plugin plugin, IPath path) {
-//		// TODO: Implement
-//
-//	}
-
-	public IStatus createResultStatus(List errors) {
-		/*
-		 * Remove null elements from list.
-		 */
-		List oldList = errors;
-		errors = new ArrayList();
-		Iterator iterator = oldList.iterator(); 
-		while (iterator.hasNext()) {
-			Object object = iterator.next();
-			if (object != null) {
-				errors.add(object);
-			}
-		}
-	
-		if (errors.isEmpty()) {
-			return new Status(IStatus.OK, pluginID, 0, Messages.AttributeVerification_ConfigurationOK, null);
-		} else {
-			/*
-			 * TODO: make code better, without iterator
-			 */ 
-			MultiStatus result = new MultiStatus(pluginID, 0, Messages.AttributeVerification_InvalidConfiguration, null);
-			Iterator iterator2 = errors.iterator(); 
-			while (iterator2.hasNext()) {
-				IStatus object = (IStatus) iterator2.next();
-				result.add(object);
-			}
-			return result;
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/ControlAttributes.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/ControlAttributes.java
deleted file mode 100644
index 78c53a6..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/ControlAttributes.java
+++ /dev/null

@@ -1,365 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.utils.verification;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-public class ControlAttributes implements Cloneable {
-
-	Map currentMap = null;
-
-	Map defaultMap = null;
-
-	/** Create an instance without default values. */
-	public ControlAttributes(Map config) {
-		super();
-		this.currentMap = config;
-		this.defaultMap = new HashMap();
-	}
-
-	/** Create an instance with default values. */
-	public ControlAttributes(Map currentMap, Map defaultMap) {
-		super();
-		this.currentMap = currentMap;
-		this.defaultMap = defaultMap;
-	}
-
-	/** Return the current value of an attribute, if available. */
-	private String getCurrent(String attributeName) {
-		if (currentMap == null) {
-			return null;
-		}
-		return (String) currentMap.get(attributeName);
-	}
-
-	/** Return the default value of an attribute, if available. */
-	private String getDefault(String attributeName) {
-		if (defaultMap == null) {
-			return null;
-		}
-		return (String) defaultMap.get(attributeName);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#clone()
-	 */
-	public Object clone() throws CloneNotSupportedException {
-		ControlAttributes newObject = new ControlAttributes(null);
-		if (currentMap != null) {
-			newObject.currentMap = new HashMap(currentMap);
-		}
-		if (defaultMap != null) {
-			newObject.defaultMap = new HashMap(defaultMap);
-		}
-		return newObject;
-	}
-
-	/***************************************************************************
-	 * Safe GETTERS The safe getters return the current value, if available and
-	 * parseable. Otherwise, return the default value, if available and
-	 * parseable. Otherwise, return some hard-coded fallback value. If the
-	 * current value cannot be parsed, no exception is thrown, but the default
-	 * value is used.
-	 **************************************************************************/
-	/**
-	 * Get the attribute as string. If not available or not parseable, get
-	 * default. If default not available, get <code>null</code>.
-	 */
-	public String getAttributeOrDefault(String attributeName) {
-		String value = getCurrent(attributeName);
-		if (value == null) {
-			return getDefault(attributeName);
-		} else {
-			return value;
-		}
-	}
-
-	/**
-	 * Get the attribute as string. If not available or not parseable, get
-	 * default. If default not available or not parseable, get empty string.
-	 */
-	public String getString(String attributeKey) {
-		return getString(attributeKey, ""); //$NON-NLS-1$
-	}
-
-	/**
-	 * Get the attribute as string. If not available or not parseable, get
-	 * default. If default not available or not parseable, get parameter default
-	 * value.
-	 */
-	public String getString(String attributeKey, String defaultValue) {
-		String stringValue = getAttributeOrDefault(attributeKey);
-		if (stringValue == null)
-			return defaultValue;
-		return stringValue;
-	}
-
-	/**
-	 * Get the attribute as text (multi line string). If not available or not
-	 * parseable, get default. If default not available or not parseable, get
-	 * empty string.
-	 */
-	public String getText(String attributeKey) {
-		return getText(attributeKey, ""); //$NON-NLS-1$
-	}
-
-	/**
-	 * Get the attribute as text (multi line string). If not available or not
-	 * parseable, get default. If default not available or not parseable, get
-	 * parameter default value.
-	 */
-	public String getText(String attributeKey, String defaultValue) {
-		String textValue = getAttributeOrDefault(attributeKey);
-		if (textValue == null)
-			textValue = defaultValue;
-		textValue = textValue.replaceAll("\\n", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
-		textValue = textValue.replaceAll("\\\\", "\\"); //$NON-NLS-1$ //$NON-NLS-2$
-		return textValue;
-	}
-
-	/**
-	 * Get the attribute as boolean. If not available or not parseable, get
-	 * default. If default not available or not parseable, get false.
-	 */
-	public boolean getBoolean(String attributeKey) {
-		return getBoolean(attributeKey, false);
-	}
-
-	/**
-	 * Get the attribute as boolean. If not available or not
-	 * parseable, get default. If default not available or not parseable, get
-	 * parameter default value.
-	 */
-	public boolean getBoolean(String attributeKey, boolean defaultValue) {
-		String string = getAttributeOrDefault(attributeKey);
-		if (string == null) {
-			return defaultValue;
-		} else {
-			return Boolean.valueOf(string).booleanValue();
-		}
-	}
-
-	/**
-	 * Get the attribute as integer. If not available or not parseable, get
-	 * default. If default not available or not parseable, get zero.
-	 */
-	public int getInteger(String attributeKey) {
-		return getInteger(attributeKey, 0);
-	}
-
-	/**
-	 * Get the attribute as integer. If not available or not
-	 * parseable, get default. If default not available or not parseable, get
-	 * parameter default value.
-	 */
-	public int getInteger(String attributeKey, int defaultValue) {
-		String string = getAttributeOrDefault(attributeKey);
-		if (string == null) {
-			return defaultValue;
-		}
-		try {
-			return Integer.parseInt(string);
-		} catch (NumberFormatException e1) {
-			try {
-				string = getDefault(attributeKey);
-				if (string == null) {
-					return defaultValue;
-				} else {
-					return Integer.parseInt(string);
-				}
-			} catch (NumberFormatException e2) {
-				return defaultValue;
-			}
-		}
-	}
-
-	/**
-	 * Get the attribute as double. If not available or not parseable, get
-	 * default. If default not available or not parseable, get zero.
-	 */
-	public double getDouble(String attributeKey) {
-		return getDoubleAttribute(attributeKey, 0.0);
-	}
-
-	/**
-	 * Get the attribute as double. If not available or not
-	 * parseable, get default. If default not available or not parseable, get
-	 * parameter default value.
-	 */
-	public double getDouble(String attributeKey, double defaultValue) {
-		String string = getAttributeOrDefault(attributeKey);
-		if (string == null) {
-			return defaultValue;
-		}
-		try {
-			return Double.parseDouble(string);
-		} catch (NumberFormatException e1) {
-			try {
-				string = getDefault(attributeKey);
-				if (string == null) {
-					return defaultValue;
-				} else {
-					return Double.parseDouble(string);
-				}
-			} catch (NumberFormatException e2) {
-				return defaultValue;
-			}
-		}
-	}
-
-	/***************************************************************************
-	 * Old GETTERS They are deprecated.
-	 **************************************************************************/
-	/** @deprecated */
-	public boolean getBooleanAttribute(String attributeKey, boolean defaultValue) {
-		return getBoolean(attributeKey, defaultValue);
-	}
-
-	/** @deprecated */
-	public int getIntegerAttribute(String attributeKey, int defaultValue) {
-		return getInteger(attributeKey, defaultValue);
-	}
-
-	/** @deprecated */
-	public double getDoubleAttribute(String attributeKey, double defaultValue) {
-		return getDouble(attributeKey, defaultValue);
-	}
-
-	/** @deprecated */
-	public String getStringAttribute(String attributeKey, String defaultValue) {
-		return getString(attributeKey, defaultValue);
-	}
-
-	/** @deprecated */
-	public String getTextAttribute(String attributeKey, String defaultValue) {
-		return getText(attributeKey, defaultValue);
-	}
-
-	/***************************************************************************
-	 * Verifying GETTERS
-	 **************************************************************************/
-	/**
-	 * @deprecated
-	 */
-	public int verifyIntAttribute(String attributeName, String attributeKey,
-			int defaultValue) throws IllegalAttributeException {
-		String stringValue = getAttributeOrDefault(attributeKey);
-		if (stringValue == null) {
-			return defaultValue;
-		}
-		try {
-			return Integer.parseInt(stringValue);
-		} catch (NumberFormatException e) {
-			throw new IllegalAttributeException(e, attributeName,
-					Messages.ControlAttributes_InvalidIntegerNumber, stringValue);
-		}
-	}
-
-	public int verifyInt(String attributeName, String attributeKey)
-			throws IllegalAttributeException {
-		String stringValue = verifyString(attributeName, attributeKey);
-		try {
-			return Integer.parseInt(stringValue);
-		} catch (NumberFormatException e) {
-			throw new IllegalAttributeException(e, attributeName,
-					Messages.ControlAttributes_InvalidIntegerNumber, stringValue);
-		}
-	}
-
-	/**
-	 * @deprecated
-	 */
-	public double verifyDoubleAttribute(String attributeName,
-			String attributeKey, double defaultValue)
-			throws IllegalAttributeException {
-		String stringValue = getAttributeOrDefault(attributeKey);
-		if (stringValue == null)
-			return defaultValue;
-		try {
-			return Double.parseDouble(stringValue);
-		} catch (NumberFormatException e) {
-			throw new IllegalAttributeException(e, attributeName,
-					Messages.ControlAttributes_InvalidDecimalNumber, stringValue);
-		}
-	}
-
-	public double verifyDouble(String attributeName, String attributeKey)
-			throws IllegalAttributeException {
-		String stringValue = verifyString(attributeName, attributeKey);
-		try {
-			return Double.parseDouble(stringValue);
-		} catch (NumberFormatException e) {
-			throw new IllegalAttributeException(e, attributeName,
-					Messages.ControlAttributes_InvalidDecimalNumber, stringValue);
-		}
-	}
-
-	public IPath verifyPath(String attributeName, String attributeKey)
-			throws IllegalAttributeException {
-		String stringValue = verifyString(attributeName, attributeKey);
-
-		// TODO: Implement a proper checking
-		Path path = new Path(""); //$NON-NLS-1$
-		if (!path.isValidPath(stringValue)) {
-			throw new IllegalAttributeException(attributeName,
-					Messages.ControlAttributes_InvalidPath, stringValue);
-		}
-		return new Path(stringValue);
-	}
-
-	public String verifyString(String attributeName, String attributeKey)
-			throws IllegalAttributeException {
-		String stringValue = getAttributeOrDefault(attributeKey);
-		if (stringValue == null) {
-			throw new IllegalAttributeException(attributeName,
-					Messages.ControlAttributes_MustNotBeEmpty);
-		}
-		return stringValue;
-	}
-
-	/***************************************************************************
-	 * SETTERS
-	 **************************************************************************/
-	public void setAttribute(String attributeKey, String value) {
-		currentMap.put(attributeKey, value);
-	}
-
-	public void setStringAttribute(String attributeKey, String value) {
-		setAttribute(attributeKey, value);
-	}
-
-	public void setIntAttribute(String attributeKey, int value) {
-		setAttribute(attributeKey, Integer.toString(value));
-	}
-
-	public void setDoubleAttribute(String attributeKey, double value) {
-		setAttribute(attributeKey, Double.toString(value));
-	}
-
-	public void setBooleanAttribute(String attributeKey, boolean value) {
-		setAttribute(attributeKey, Boolean.toString(value));
-	}
-
-	public void setTextAttribute(String attributeKey, String value) {
-		String textValue = value;
-		textValue = textValue.replaceAll("\\", "\\\\"); //$NON-NLS-1$ //$NON-NLS-2$
-		textValue = textValue.replaceAll("\n", "\\n"); //$NON-NLS-1$ //$NON-NLS-2$
-		setAttribute(attributeKey, textValue);
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/IllegalAttributeException.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/IllegalAttributeException.java
deleted file mode 100644
index 4ad9da2..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/IllegalAttributeException.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.utils.verification;
-
-public class IllegalAttributeException extends Exception {
-
-	String name;
-	String value;
-	
-	public IllegalAttributeException() {
-	}
-
-	public IllegalAttributeException(String arg0) {
-		super(arg0);
-	}
-
-	public IllegalAttributeException(Throwable arg0) {
-		super(arg0);
-	}
-
-	public IllegalAttributeException(String arg0, Throwable arg1) {
-		super(arg0, arg1);
-	}
-
-	public IllegalAttributeException(String message, String name) {
-		super(name + ": " + message); //$NON-NLS-1$
-		this.name = name;
-	}
-
-	public IllegalAttributeException(String message, String name, String value) {
-		super(name + ": " + message + "( " + value + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		this.value = value;
-		this.name = name;
-	}
-
-	public IllegalAttributeException(Exception e, String name, String message, String value) {
-		super(name + ": " + message + "( " + value + ")", e); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		this.value = value;
-		this.name = name;
-	}
-
-	/**
-	 * @return the name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @return the value
-	 */
-	public String getValue() {
-		return value;
-	}
-	
-	
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/Messages.java
deleted file mode 100644
index 2c782e0..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/Messages.java
+++ /dev/null

@@ -1,31 +0,0 @@
-package org.eclipse.ptp.remotetools.utils.verification;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.cell.utils.verification.messages"; //$NON-NLS-1$
-	public static String AttributeVerification_ConfigurationOK;
-	public static String AttributeVerification_ErrorMessage;
-	public static String AttributeVerification_InvalidConfiguration;
-	public static String AttributeVerification_InvalidPath;
-	public static String AttributeVerification_MustBeLocalFile;
-	public static String AttributeVerification_NotAnAbsolutePath;
-	public static String AttributeVerification_NoValue;
-	public static String AttributeVerification_PathDoesNotExist;
-	public static String AttributeVerification_PathIsNotDir;
-	public static String AttributeVerification_PathIsNotExecutableFile;
-	public static String AttributeVerification_PathIsNotFile;
-	public static String AttributeVerification_PathIsNotWritable;
-	public static String AttributeVerification_PathNotFound;
-	public static String ControlAttributes_InvalidDecimalNumber;
-	public static String ControlAttributes_InvalidIntegerNumber;
-	public static String ControlAttributes_InvalidPath;
-	public static String ControlAttributes_MustNotBeEmpty;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/messages.properties
deleted file mode 100644
index 0f18702..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.core/src/org/eclipse/ptp/remotetools/utils/verification/messages.properties
+++ /dev/null

@@ -1,17 +0,0 @@
-AttributeVerification_NoValue=no value
-AttributeVerification_ErrorMessage={0}: {1} ({2})
-AttributeVerification_InvalidPath=is not a valid path
-AttributeVerification_NotAnAbsolutePath=is not an absolute path
-AttributeVerification_PathDoesNotExist=Path does not exist
-AttributeVerification_PathIsNotDir=Path is not a directory
-AttributeVerification_PathIsNotExecutableFile=Path is not an executable file
-AttributeVerification_PathIsNotWritable=Path is not writable
-AttributeVerification_PathIsNotFile=Path is not a file
-AttributeVerification_PathNotFound=Path not found in plug-in
-AttributeVerification_MustBeLocalFile=Must be a local file
-AttributeVerification_ConfigurationOK=Configuration is OK
-AttributeVerification_InvalidConfiguration=Configuration contains invalid values
-ControlAttributes_InvalidIntegerNumber=is not valid integer number
-ControlAttributes_InvalidDecimalNumber=is not valid decimal number
-ControlAttributes_InvalidPath=is not valid path
-ControlAttributes_MustNotBeEmpty=must not be empty

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/.classpath b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/.classpath
deleted file mode 100755
index 64c5e31..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/.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/remotetools/org.eclipse.ptp.remotetools.environment.generichost/.project b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/.project
deleted file mode 100755
index 21333a2..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.remotetools.environment.generichost</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/remotetools/org.eclipse.ptp.remotetools.environment.generichost/.settings/org.eclipse.jdt.core.prefs b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index cbd7556..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,8 +0,0 @@
-#Fri Apr 16 12:58:58 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/remotetools/org.eclipse.ptp.remotetools.environment.generichost/META-INF/MANIFEST.MF b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/META-INF/MANIFEST.MF
deleted file mode 100755
index 4bc6bc5..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.remotetools.environment.generichost;singleton:=true
-Bundle-Version: 1.3.3.qualifier
-Bundle-Activator: org.eclipse.ptp.remotetools.environment.generichost.Activator
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ptp.remotetools.environment.core,
- org.eclipse.ui,
- org.eclipse.ptp.remotetools.core,
- org.eclipse.ptp.remotetools.utils,
- org.eclipse.ptp.remotetools.preferences,
- org.eclipse.ptp.utils.ui
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.ptp.remotetools.environment.generichost
-Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/about.html b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/about.html
deleted file mode 100755
index a78242d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/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>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/build.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/build.properties
deleted file mode 100755
index e398e4e..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/build.properties
+++ /dev/null

@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               plugin.properties

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/plugin.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/plugin.properties
deleted file mode 100644
index 7efebb8..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/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 Remote Tools Generic Host
-pluginProvider=Eclipse.org

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/plugin.xml b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/plugin.xml
deleted file mode 100755
index e5d1725..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/plugin.xml
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.ptp.remotetools.environment.core.remoteEnvironmentControlDelegate">
-      <control
-            class="org.eclipse.ptp.remotetools.environment.generichost.core.Environment"
-            name="Generic Host"/>
-   </extension>
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            category="org.eclipse.ptp.remotetools.preferences.ui.RemoteToolsPreferencePage.EnvironmentPreferencePage"
-            class="org.eclipse.ptp.remotetools.environment.generichost.preferences.ui.PreferencePage"
-            id="org.eclipse.ptp.remotetools.environment.generichost.GenericHostPreferencePage"
-            name="Generic Host"/>      
-   </extension>
-   <extension
-         point="org.eclipse.core.runtime.preferences">
-      <initializer class="org.eclipse.ptp.remotetools.environment.generichost.preferences.ui.PreferenceInitializer"/>
-   </extension>
-</plugin>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/Activator.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/Activator.java
deleted file mode 100755
index 33ae0aa..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/Activator.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.generichost;
-
-import org.eclipse.ptp.remotetools.environment.EnvironmentPlugin;
-import org.eclipse.ptp.remotetools.environment.generichost.core.Environment;
-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.remotetools.environment.genericohost";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		// Notifies the core plugin to destroy all environments.
-		EnvironmentPlugin corePlugin = EnvironmentPlugin.getDefault();
-		corePlugin.destroyTypeElements(Environment.class);
-		
-		plugin = null;
-		super.stop(context);
-	}
-	
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/AttributeNames.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/AttributeNames.java
deleted file mode 100755
index a6a73b8..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/AttributeNames.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.generichost.conf;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Defines names of attributes. Intended for an uniform and consistent use of names for
- * attributes in GUI, error messages and configuration files across plugins.
- * 
- * @author Daniel Felix Ferber
- * 
- */
-public class AttributeNames extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remotetools.environment.generichost.conf.attribute_names"; //$NON-NLS-1$
-
-	public static String CONNECTION_ADDRESS;
-	public static String CONNECTION_PORT;
-	public static String CONNECTION_TIMEOUT;
-	public static String KEY_PASSPHRASE;
-	public static String KEY_PATH;
-	public static String LOGIN_PASSWORD;
-	public static String LOGIN_USERNAME;
-	public static String SYSTEM_WORKSPACE;
-	
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, AttributeNames.class);
-	}
-
-	private AttributeNames() {
-	}
-}
-

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/DefaultValues.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/DefaultValues.java
deleted file mode 100755
index def5ceb..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/DefaultValues.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.generichost.conf;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author Richard Maciel
- *
- * @since 1.2.1
- */
-public class DefaultValues extends NLS
-{
-	private static final String BUNDLE_ID = "org.eclipse.ptp.remotetools.environment.generichost.conf.defaults"; //$NON-NLS-1$
-
-
-	public static String LOCALHOST_SELECTION;
-	public static String LOGIN_USERNAME;
-	public static String LOGIN_PASSWORD;
-	public static String CONNECTION_ADDRESS;
-	public static String CONNECTION_PORT;
-	public static String CONNECTION_TIMEOUT;
-	public static String KEY_PATH;
-	public static String KEY_PASSPHRASE;
-	public static String IS_PASSWORD_AUTH;
-	public static String SYSTEM_WORKSPACE;
-	
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_ID, DefaultValues.class);
-	}
-
-	private DefaultValues() {
-		// cannot create new instance
-	}
-}
-
-	

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/attribute_names.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/attribute_names.properties
deleted file mode 100755
index 751f96d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/attribute_names.properties
+++ /dev/null

@@ -1,18 +0,0 @@
-###############################################################################
-# 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
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-LOGIN_USERNAME=User name remote connection
-LOGIN_PASSWORD=Password remote connection
-CONNECTION_ADDRESS=Address for remote connection
-CONNECTION_PORT=Port for remote connection
-KEY_PATH=Path to file with private key for remote connection
-KEY_PASSPHRASE=Passphrase to open private key for remote connection
-CONNECTION_TIMEOUT=Timeout for remote connection
-SYSTEM_WORKSPACE=Launch base directory

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/defaults.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/defaults.properties
deleted file mode 100755
index a71bfde..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/conf/defaults.properties
+++ /dev/null

@@ -1,21 +0,0 @@
-###############################################################################
-# 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
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-LOCALHOST_SELECTION=true
-LOGIN_USERNAME=
-LOGIN_PASSWORD=
-CONNECTION_ADDRESS=
-CONNECTION_PORT=22
-CONNECTION_TIMEOUT=5
-KEY_PATH=
-KEY_PASSPHRASE=
-IS_PASSWORD_AUTH=true
-SYSTEM_WORKSPACE=/tmp/remotetools
-CIPHER_TYPE=

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/ConfigFactory.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/ConfigFactory.java
deleted file mode 100755
index a37596d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/ConfigFactory.java
+++ /dev/null

@@ -1,131 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.generichost.core;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ptp.remotetools.environment.generichost.Activator;
-import org.eclipse.ptp.remotetools.environment.generichost.conf.AttributeNames;
-import org.eclipse.ptp.remotetools.environment.generichost.conf.DefaultValues;
-import org.eclipse.ptp.remotetools.utils.verification.ControlAttributes;
-import org.eclipse.ptp.remotetools.utils.verification.IllegalAttributeException;
-
-
-/**
- * Defines rules to build the target configuration from an attribute hash map.
- * 
- * @author Daniel Felix Ferber
- * @since 1.2
- */
-public class ConfigFactory {
-	Map currentMap = null;
-	Map defaultMap = null;
-	
-	ControlAttributes attributes = null;
-	
-	private static final String PREFIX = "org.eclipse.ptp.remotetools.environment.generichost.."; //$NON-NLS-1$
-	public static final String ATTR_LOCALHOST_SELECTION = PREFIX + "localhost-selection"; //$NON-NLS-1$
-	public static final String ATTR_LOGIN_USERNAME = PREFIX + "login-username"; //$NON-NLS-1$
-	public static final String ATTR_LOGIN_PASSWORD = PREFIX + "login-password"; //$NON-NLS-1$
-	public static final String ATTR_CONNECTION_ADDRESS = PREFIX + "connection-address"; //$NON-NLS-1$
-	public static final String ATTR_CONNECTION_PORT = PREFIX + "connection-port"; //$NON-NLS-1$
-	public static final String ATTR_KEY_PATH = PREFIX + "key-path"; //$NON-NLS-1$
-	public static final String ATTR_KEY_PASSPHRASE = PREFIX + "key-passphrase"; //$NON-NLS-1$
-	public static final String ATTR_IS_PASSWORD_AUTH = PREFIX + "is-passwd-auth"; //$NON-NLS-1$
-	public static final String ATTR_CONNECTION_TIMEOUT = PREFIX + "connection-timeout"; //$NON-NLS-1$
-	public static final String ATTR_SYSTEM_WORKSPACE = PREFIX + "system-workspace-dir"; //$NON-NLS-1$
-	public static final String ATTR_CIPHER_TYPE = PREFIX + "cipher-type"; //$NON-NLS-1$
-	
-	public final static String[] KEY_ARRAY = { ATTR_LOCALHOST_SELECTION,
-			ATTR_LOGIN_USERNAME, ATTR_CONNECTION_PORT, ATTR_CONNECTION_ADDRESS,
-			ATTR_KEY_PATH, ATTR_IS_PASSWORD_AUTH, ATTR_CONNECTION_TIMEOUT,
-			ATTR_SYSTEM_WORKSPACE, ATTR_CIPHER_TYPE};
-	
-	public final static String[] KEY_CIPHERED_ARRAY = { ATTR_KEY_PASSPHRASE,
-			ATTR_LOGIN_PASSWORD };
-	
-	public ConfigFactory() {
-		createDefaultMap();
-		createCurrentMapFromPreferences();
-		attributes = new ControlAttributes(currentMap, defaultMap);
-	}
-	
-	public ConfigFactory(Map newMap) {
-		createDefaultMap();
-		if (newMap == null) {
-			createCurrentMapFromPreferences();
-		} else {
-			currentMap = new HashMap(newMap);
-		}
-		attributes = new ControlAttributes(currentMap, defaultMap);
-	}
-	
-	public Map getMap() {
-		return currentMap;
-	}
-	
-	public ControlAttributes getAttributes() {
-		return attributes;
-	}
-	
-	private void createDefaultMap() {
-		defaultMap = new HashMap();
-		defaultMap.put(ATTR_LOCALHOST_SELECTION, DefaultValues.LOCALHOST_SELECTION);
-		defaultMap.put(ATTR_LOGIN_USERNAME, DefaultValues.LOGIN_USERNAME);
-		defaultMap.put(ATTR_LOGIN_PASSWORD, DefaultValues.LOGIN_PASSWORD);
-		defaultMap.put(ATTR_CONNECTION_PORT, DefaultValues.CONNECTION_PORT);
-		defaultMap.put(ATTR_CONNECTION_ADDRESS, DefaultValues.CONNECTION_ADDRESS);
-		defaultMap.put(ATTR_KEY_PATH, DefaultValues.KEY_PATH);
-		defaultMap.put(ATTR_KEY_PASSPHRASE, DefaultValues.KEY_PASSPHRASE);
-		defaultMap.put(ATTR_IS_PASSWORD_AUTH, DefaultValues.IS_PASSWORD_AUTH);
-		defaultMap.put(ATTR_CONNECTION_TIMEOUT, DefaultValues.CONNECTION_TIMEOUT);
-		defaultMap.put(ATTR_SYSTEM_WORKSPACE, DefaultValues.SYSTEM_WORKSPACE);
-		defaultMap.put(ATTR_CIPHER_TYPE, TargetControl.DEFAULT_CIPHER);
-	}
-	
-	private void createCurrentMapFromPreferences() {
-		currentMap = new HashMap();
-		IPreferenceStore store = Activator.getDefault().getPreferenceStore();
-		currentMap.put(ATTR_LOGIN_USERNAME, store.getString(ATTR_LOGIN_USERNAME));
-		currentMap.put(ATTR_CONNECTION_ADDRESS, store.getString(ATTR_CONNECTION_ADDRESS));
-		currentMap.put(ATTR_CONNECTION_PORT, store.getString(ATTR_CONNECTION_PORT));
-		currentMap.put(ATTR_SYSTEM_WORKSPACE, store.getString(ATTR_SYSTEM_WORKSPACE));
-	}
-	
-	public TargetConfig createTargetConfig() throws CoreException {
-		try {
-			TargetConfig config = new TargetConfig();
-			config.setLoginUserName(attributes.getString(ATTR_LOGIN_USERNAME));
-			config.setLoginPassword(attributes.getString(ATTR_LOGIN_PASSWORD));
-			config.setConnectionPort(attributes.verifyInt(AttributeNames.CONNECTION_PORT, ATTR_CONNECTION_PORT));
-			if (attributes.getBoolean(ATTR_LOCALHOST_SELECTION)) {
-				config.setConnectionAddress("localhost"); //$NON-NLS-1$
-			} else {
-				config.setConnectionAddress(attributes.getString(ATTR_CONNECTION_ADDRESS));
-			}
-			config.setConnectionTimeout(attributes.verifyInt(AttributeNames.CONNECTION_TIMEOUT, ATTR_CONNECTION_TIMEOUT));
-			config.setKeyPassphrase(attributes.getString(ATTR_KEY_PASSPHRASE));
-			config.setKeyPath(attributes.getString(ATTR_KEY_PATH));
-			config.setIsPasswordAuth(attributes.getBoolean(ATTR_IS_PASSWORD_AUTH));
-			config.setSystemWorkspace(attributes.getString(ATTR_SYSTEM_WORKSPACE));
-			config.setCipherType(attributes.getString(ATTR_CIPHER_TYPE));
-			return config;
-		} catch (IllegalAttributeException e) {
-			throw new CoreException(new Status(Status.ERROR, Activator.getDefault().getBundle().getSymbolicName(), 0, e.getMessage(), e));
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/Environment.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/Environment.java
deleted file mode 100755
index bf1d494..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/Environment.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.generichost.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControl;
-import org.eclipse.ptp.remotetools.environment.core.ITargetElement;
-import org.eclipse.ptp.remotetools.environment.extension.ITargetTypeExtension;
-import org.eclipse.ptp.remotetools.environment.generichost.ui.ConfigurationPage;
-import org.eclipse.ptp.remotetools.environment.wizard.AbstractEnvironmentDialogPage;
-
-/**
- * Factory for the environment.
- * 
- * @author Daniel Felix Ferber
- * @since 1.2
- */
-public class Environment implements ITargetTypeExtension {
-
-	public Environment() {
-		super();
-	}
-
-	public ITargetControl controlFactory(ITargetElement element) throws CoreException {
-		return new TargetControl(element);
-	}
-
-	public String[] getControlAttributeNames() {
-		return ConfigFactory.KEY_ARRAY;
-	}
-
-	public AbstractEnvironmentDialogPage dialogPageFactory(ITargetElement targetElement) {
-		return new ConfigurationPage(targetElement.getName(), targetElement.getAttributes());
-	}
-
-	public AbstractEnvironmentDialogPage dialogPageFactory() {
-		return new ConfigurationPage();
-	}
-
-	public String[] getControlAttributeNamesForCipheredKeys() {
-		return ConfigFactory.KEY_CIPHERED_ARRAY;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/TargetConfig.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/TargetConfig.java
deleted file mode 100755
index ceec343..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/TargetConfig.java
+++ /dev/null

@@ -1,96 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.generichost.core;
-
-/**
- * Describes a target created from the environment.
- * 
- * @author Daniel Felix Ferber
- * @since 1.2
- */
-public class TargetConfig {
-	private String loginUserName;
-	private String loginPassword;
-	private int connectionPort;
-	private String connectionAddress;
-	private int connectionTimeout;
-	private String keyPath;
-	private String keyPassphrase;
-	private boolean isPasswordAuth;
-	private String systemWorkspace;
-	private String cipherType;
-	
-	public String getConnectionAddress() {
-		return connectionAddress;
-	}
-	public void setConnectionAddress(String connectionAddress) {
-		this.connectionAddress = connectionAddress;
-	}
-	public int getConnectionPort() {
-		return connectionPort;
-	}
-	public void setConnectionPort(int connectionPort) {
-		this.connectionPort = connectionPort;
-	}
-	public String getLoginPassword() {
-		return loginPassword;
-	}
-	public void setLoginPassword(String loginPassword) {
-		this.loginPassword = loginPassword;
-	}
-	public String getLoginUserName() {
-		return loginUserName;
-	}
-	public void setLoginUserName(String loginUserName) {
-		this.loginUserName = loginUserName;
-	}
-	public void setKeyPath(String keyPath) {
-		this.keyPath = keyPath;
-	}
-	public void setKeyPassphrase(String keyPassphrase) {
-		this.keyPassphrase = keyPassphrase;
-	}
-	public void setIsPasswordAuth(boolean isPasswordAuth) {
-		this.isPasswordAuth = isPasswordAuth; 
-		
-	}
-	public int getConnectionTimeout() {
-		return connectionTimeout;
-	}
-	public void setConnectionTimeout(int connectionTimeout) {
-		this.connectionTimeout = connectionTimeout;
-	}
-	public boolean isPasswordAuth() {
-		return isPasswordAuth;
-	}
-	public void setPasswordAuth(boolean isPasswordAuth) {
-		this.isPasswordAuth = isPasswordAuth;
-	}
-	public String getKeyPassphrase() {
-		return keyPassphrase;
-	}
-	public String getKeyPath() {
-		return keyPath;
-	}
-	public void setSystemWorkspace(String systemWorkspace) {
-		this.systemWorkspace = systemWorkspace;
-	}
-	public String getSystemWorkspace() {
-		return systemWorkspace;
-	}
-	public void setCipherType(String cipherType) {
-		this.cipherType = cipherType;
-	}
-	public String getCipherType() {
-		return cipherType;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/TargetControl.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/TargetControl.java
deleted file mode 100755
index 35ea044..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/core/TargetControl.java
+++ /dev/null

@@ -1,215 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.generichost.core;
-
-
-import org.eclipse.core.runtime.Assert;
-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.remotetools.RemotetoolsPlugin;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControl;
-import org.eclipse.ptp.remotetools.environment.control.ITargetStatus;
-import org.eclipse.ptp.remotetools.environment.control.SSHTargetControl;
-import org.eclipse.ptp.remotetools.environment.core.ITargetElement;
-import org.eclipse.ptp.remotetools.environment.extension.ITargetVariables;
-import org.eclipse.ptp.remotetools.environment.generichost.Activator;
-import org.eclipse.ptp.remotetools.environment.generichost.messages.Messages;
-
-/**
- * Controls an instance of a target created from the Environment.
- * @author Daniel Felix Ferber
- * @since 1.2
- */
-public class TargetControl extends SSHTargetControl implements ITargetControl, ITargetVariables {
-
-	/**
-	 * Configuration provided to the target control.
-	 */
-	ConfigFactory configFactory;
-	TargetConfig currentTargetConfig;
-	
-	/**
-	 * Name of the target.
-	 */
-	//String name;
-	
-	/**
-	 * BackReference to the target element
-	 */
-	ITargetElement targetElement;
-	
-	/**
-	 * Current connection state.
-	 */
-	private int state;
-	private static final int NOT_OPERATIONAL = 1;
-	private static final int CONNECTING = 2;
-	private static final int CONNECTED = 3;
-	private static final int DISCONNECTING = 4;
-	
-	/**
-	 * Default cipher id
-	 */
-	public static final String DEFAULT_CIPHER = RemotetoolsPlugin.CIPHER_DEFAULT;
-	
-	/**
-	 * Creates a target control.
-	 * 
-	 * @param attributes
-	 *            Configuration attributes
-	 * @param element
-	 *            Name for the target (displayed in GUI)
-	 * @throws CoreException
-	 *             Some attribute is not valid
-	 */
-	public TargetControl(ITargetElement element) throws CoreException {
-		super();
-		state = NOT_OPERATIONAL;
-		targetElement = element;
-		configFactory = new ConfigFactory(targetElement.getAttributes());
-		currentTargetConfig = configFactory.createTargetConfig();
-	}
-
-	/**
-	 * Connect to the remote target.. On every error or possible failure, an exception
-	 * (CoreException) is thrown, whose (multi)status describe the error(s) that prevented creating the target control.
-	 * 
-	 * @param monitor
-	 *            Progress indicator or <code>null</code>
-	 * @return Always true.
-	 * @throws CoreException
-	 *             Some attribute is not valid, the simulator cannot be launched, the ssh failed to connect.
-	 */
-	public boolean create(IProgressMonitor monitor) throws CoreException {
-		monitor.beginTask(Messages.TargetControl_create_MonitorConnecting, 1);
-		/*
-		 *  Connect to the remote temote target
-		 */
-		if(currentTargetConfig.isPasswordAuth()) {
-			setConnectionParameters(
-					new SSHParameters(
-							currentTargetConfig.getConnectionAddress(),
-							currentTargetConfig.getConnectionPort(),
-							currentTargetConfig.getLoginUserName(),
-							currentTargetConfig.getLoginPassword(),
-							currentTargetConfig.getCipherType(),
-							currentTargetConfig.getConnectionTimeout()*1000
-					)
-				);
-		} else {
-			setConnectionParameters(
-					new SSHParameters(
-							currentTargetConfig.getConnectionAddress(),
-							currentTargetConfig.getConnectionPort(),
-							currentTargetConfig.getLoginUserName(),
-							currentTargetConfig.getKeyPath(),
-							currentTargetConfig.getKeyPassphrase(),
-							currentTargetConfig.getCipherType(),
-							currentTargetConfig.getConnectionTimeout()*1000
-					)
-				);
-		}
-		
-		try {
-			setState(CONNECTING);
-			super.create(monitor);
-			setState(CONNECTED);
-			monitor.worked(1);
-		} catch (CoreException e) {
-			disconnect();
-			setState(NOT_OPERATIONAL);
-		}
-		monitor.done();
-		return true;
-	}
-
-	private synchronized void setState(int state) {
-		this.state = state;
-	}
-
-	public boolean kill(IProgressMonitor monitor) throws CoreException {
-		try {
-			setState(DISCONNECTING);
-			super.kill(monitor);
-		} finally {
-			setState(NOT_OPERATIONAL);
-		}
-		return true;
-	}
-
-	public synchronized int query() {
-		switch (state) {
-		case NOT_OPERATIONAL:
-			return ITargetStatus.STOPPED;
-		case CONNECTING:
-		case DISCONNECTING:
-			return ITargetStatus.STARTED;
-		case CONNECTED:
-			if (isConnected()) {
-				return ITargetStatus.RESUMED;
-			} else {
-				return ITargetStatus.STARTED;
-			}
-		default:
-			return ITargetStatus.STOPPED;
-		}
-	}
-
-	public boolean resume(IProgressMonitor monitor) throws CoreException {
-		throw new CoreException(new Status(IStatus.ERROR, getPluginId(), 0,
-				Messages.TargetControl_resume_CannotResume, null));
-	}
-
-	public boolean stop(IProgressMonitor monitor) throws CoreException {
-		throw new CoreException(new Status(IStatus.ERROR, getPluginId(), 0,
-				Messages.TargetControl_stop_CannotPause, null));
-	}
-
-	public void updateConfiguration() throws CoreException {
-		//targetElement.setName(name);
-		configFactory = new ConfigFactory(targetElement.getAttributes());
-		currentTargetConfig = configFactory.createTargetConfig();
-	}
-
-	public String getName() {
-		return targetElement.getName();
-	}
-
-	protected String getPluginId() {
-		return Activator.getDefault().getBundle().getSymbolicName();
-	}
-	
-	public TargetSocket createTargetSocket(int port) {
-		Assert.isTrue(isConnected());
-		TargetSocket socket = new TargetSocket();
-		socket.host = currentTargetConfig.getConnectionAddress();
-		socket.port = port;
-		return socket;
-	}
-
-	public String getSystemWorkspace() {
-		return currentTargetConfig.getSystemWorkspace();
-	}
-
-	public void destroy() throws CoreException {
-		// End all jobs, if possible, then disconnect
-		try {
-			terminateJobs(null);
-		} finally {
-			disconnect();
-		}
-		
-		//setState(NOT_OPERATIONAL);
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/messages/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/messages/Messages.java
deleted file mode 100755
index b175cc8..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/messages/Messages.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.generichost.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author Daniel Felix Ferber
- * 
- * @since 3.0
- */
-public class Messages extends NLS {
-	private static final String BUNDLE_ID = "org.eclipse.ptp.remotetools.environment.generichost.messages.messages"; //$NON-NLS-1$
-
-	public static String TargetControl_create_MonitorConnecting;
-	public static String TargetControl_resume_CannotResume;
-	public static String TargetControl_stop_CannotPause;
-	public static String PreferencePage_HeaderConnection;
-	public static String PreferencePage_LabelConnectionPort;
-	public static String PreferencePage_LabelConnectionAddress;
-	public static String PreferencePage_LabelLoginUserName;
-	public static String PreferencePage_HeaderLaunch;
-	public static String PreferencePage_LabelSystemWorkspace;
-	public static String PreferencePage_Description;
-	public static String PreferencePage_Title;
-	public static String ConfigurationPage_0;
-
-	public static String ConfigurationPage_LabelLocalhost;
-	public static String ConfigurationPage_LabelRemoteHost;
-	public static String ConfigurationPage_LabelHideAdvancedOptions;
-	public static String ConfigurationPage_LabelHostAddress;
-	public static String ConfigurationPage_LabelHostPort;
-	public static String ConfigurationPage_LabelIsPasswordBased;
-	public static String ConfigurationPage_LabelIsPublicKeyBased;
-	public static String ConfigurationPage_LabelPassphrase;
-	public static String ConfigurationPage_LabelPassword;
-	public static String ConfigurationPage_LabelPublicKeyPath;
-	public static String ConfigurationPage_LabelPublicKeyPathButton;
-	public static String ConfigurationPage_LabelUserName;
-	public static String ConfigurationPage_LabelTimeout;
-	public static String ConfigurationPage_LabelShowAdvancedOptions;
-	public static String ConfigurationPage_LabelPublicKeyPathTitle;
-	public static String ConfigurationPage_ConnectionFrameTitle;
-	public static String ConfigurationPage_DefaultTargetName;
-	public static String ConfigurationPage_DialogDescription;
-	public static String ConfigurationPage_DialogTitle;
-	public static String ConfigurationPage_LabelTargetName;
-	public static String ConfigurationPage_LabelSystemWorkspace;
-	public static String ConfigurationPage_CipherType;
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_ID, Messages.class);
-	}
-
-	private Messages() {
-		// cannot create new instance
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/messages/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/messages/messages.properties
deleted file mode 100755
index 45a557a..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/messages/messages.properties
+++ /dev/null

@@ -1,44 +0,0 @@
-###############################################################################
-# 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
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-TargetControl_create_MonitorConnecting=Connecting to a generic remote host
-TargetControl_resume_CannotResume=A generic remote host cannot be resumed from pause
-TargetControl_stop_CannotPause=A generic remote host cannot be paused
-PreferencePage_HeaderConnection=Connection to remote host:
-PreferencePage_LabelConnectionPort=Port number:
-PreferencePage_LabelConnectionAddress=Address:
-PreferencePage_LabelLoginUserName=User name:
-PreferencePage_HeaderLaunch=C/C++ generic host target launch properties:
-PreferencePage_LabelSystemWorkspace=Launch base directory:
-PreferencePage_Description=Default properties for new generic host Targets
-PreferencePage_Title=Generic Host
-ConfigurationPage_0=Remote application launcher:
-ConfigurationPage_DefaultTargetName=Generic Host
-ConfigurationPage_DialogDescription=Properties for connecting to a generic host
-ConfigurationPage_DialogTitle=Generic Host
-ConfigurationPage_LabelTargetName=Target name:
-ConfigurationPage_ConnectionFrameTitle=Host Information
-ConfigurationPage_LabelLocalhost=Localhost
-ConfigurationPage_LabelRemoteHost=Remote host
-ConfigurationPage_LabelHideAdvancedOptions=Simplified
-ConfigurationPage_LabelHostAddress=Host:
-ConfigurationPage_LabelHostPort=Port:
-ConfigurationPage_LabelIsPasswordBased=Password based authentication
-ConfigurationPage_LabelIsPublicKeyBased=Public key based authentication
-ConfigurationPage_LabelPassphrase=Passphrase:
-ConfigurationPage_LabelPassword=Password:
-ConfigurationPage_LabelPublicKeyPath=File with private key:
-ConfigurationPage_LabelPublicKeyPathTitle=Select file with private key
-ConfigurationPage_LabelPublicKeyPathButton=Select
-ConfigurationPage_LabelUserName=User:
-ConfigurationPage_LabelTimeout=Timeout(sec):
-ConfigurationPage_LabelShowAdvancedOptions=Advanced
-ConfigurationPage_LabelSystemWorkspace=Base directory:
-ConfigurationPage_CipherType=Cipher Type:

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/preferences/ui/PreferenceInitializer.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/preferences/ui/PreferenceInitializer.java
deleted file mode 100755
index e6e8aeb..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/preferences/ui/PreferenceInitializer.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.generichost.preferences.ui;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ptp.remotetools.environment.generichost.Activator;
-import org.eclipse.ptp.remotetools.environment.generichost.conf.DefaultValues;
-import org.eclipse.ptp.remotetools.environment.generichost.core.ConfigFactory;
-
-
-/**
- * Initializes preference values
- * 
- * @author Richard Maciel, Daniel Felix Ferber
- * @since 1.2.1
- */
-public class PreferenceInitializer extends AbstractPreferenceInitializer {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
-	 */
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = Activator.getDefault()//PreferencesPlugin.getDefault()
-				.getPreferenceStore();
-		store.setDefault(ConfigFactory.ATTR_LOGIN_USERNAME, DefaultValues.LOGIN_USERNAME);
-		store.setDefault(ConfigFactory.ATTR_CONNECTION_ADDRESS, DefaultValues.CONNECTION_ADDRESS);
-		store.setDefault(ConfigFactory.ATTR_CONNECTION_PORT, DefaultValues.CONNECTION_PORT);
-		store.setDefault(ConfigFactory.ATTR_SYSTEM_WORKSPACE, DefaultValues.SYSTEM_WORKSPACE);
-	}
-
-}
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/preferences/ui/PreferencePage.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/preferences/ui/PreferencePage.java
deleted file mode 100755
index 8500174..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/preferences/ui/PreferencePage.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.generichost.preferences.ui;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.IntegerFieldEditor;
-import org.eclipse.jface.preference.StringFieldEditor;
-import org.eclipse.ptp.remotetools.environment.generichost.Activator;
-import org.eclipse.ptp.remotetools.environment.generichost.core.ConfigFactory;
-import org.eclipse.ptp.remotetools.environment.generichost.messages.Messages;
-import org.eclipse.ptp.remotetools.preferences.ui.AbstractBaseFieldEditorPreferencePage;
-import org.eclipse.ptp.remotetools.preferences.ui.LabelFieldEditor;
-import org.eclipse.ptp.remotetools.preferences.ui.SpacerFieldEditor;
-import org.eclipse.ui.IWorkbench;
-
-/**
- * Preference page for the remote target default values for new targets.
- * 
- * @author Richard Maciel, Daniel Felix Ferber
- * @since 1.2.1
- */
-public class PreferencePage extends AbstractBaseFieldEditorPreferencePage {
-
-	public PreferencePage() {
-		super(GRID);
-
-		IPreferenceStore store = Activator.getDefault().getPreferenceStore();
-		setPreferenceStore(store);
-
-		// setDescription must be called here or it wont work
-		setDescription(Messages.PreferencePage_Description);
-	}
-
-	@Override
-	protected void createFieldEditors() {
-		// setTitle must be called here or it wont work
-		setTitle(Messages.PreferencePage_Title);
-
-		addField(new LabelFieldEditor(Messages.PreferencePage_HeaderConnection, getFieldEditorParent()));
-
-		StringFieldEditor addrfield = new StringFieldEditor(ConfigFactory.ATTR_CONNECTION_ADDRESS,
-				Messages.PreferencePage_LabelConnectionAddress, getFieldEditorParent());
-		addrfield.setEmptyStringAllowed(true);
-		addField(addrfield);
-
-		IntegerFieldEditor portfield = new IntegerFieldEditor(ConfigFactory.ATTR_CONNECTION_PORT,
-				Messages.PreferencePage_LabelConnectionPort, getFieldEditorParent());
-		portfield.setEmptyStringAllowed(false);
-		addField(portfield);
-
-		StringFieldEditor userfield = new StringFieldEditor(ConfigFactory.ATTR_LOGIN_USERNAME,
-				Messages.PreferencePage_LabelLoginUserName, getFieldEditorParent());
-		userfield.setEmptyStringAllowed(true);
-		addField(userfield);
-
-		addField(new LabelFieldEditor(Messages.PreferencePage_HeaderLaunch, getFieldEditorParent()));
-
-		StringFieldEditor systemWorkspaceDir = new StringFieldEditor(ConfigFactory.ATTR_SYSTEM_WORKSPACE,
-				Messages.PreferencePage_LabelSystemWorkspace, getFieldEditorParent());
-		systemWorkspaceDir.setEmptyStringAllowed(false);
-		addField(systemWorkspaceDir);
-	}
-
-	@Override
-	public void init(IWorkbench workbench) {
-	}
-
-	void addSpace() {
-		SpacerFieldEditor spacer1 = new SpacerFieldEditor(getFieldEditorParent());
-		addField(spacer1);
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/ui/ConfigurationPage.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/ui/ConfigurationPage.java
deleted file mode 100755
index b86f492..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost/src/org/eclipse/ptp/remotetools/environment/generichost/ui/ConfigurationPage.java
+++ /dev/null

@@ -1,233 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.generichost.ui;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.remotetools.environment.generichost.core.ConfigFactory;
-import org.eclipse.ptp.remotetools.environment.generichost.core.TargetControl;
-import org.eclipse.ptp.remotetools.environment.generichost.messages.Messages;
-import org.eclipse.ptp.remotetools.environment.wizard.AbstractEnvironmentDialogPage;
-import org.eclipse.ptp.remotetools.utils.verification.ControlAttributes;
-import org.eclipse.ptp.utils.ui.swt.AuthenticationFrame;
-import org.eclipse.ptp.utils.ui.swt.AuthenticationFrameMold;
-import org.eclipse.ptp.utils.ui.swt.ComboGroup;
-import org.eclipse.ptp.utils.ui.swt.ComboGroupItem;
-import org.eclipse.ptp.utils.ui.swt.Frame;
-import org.eclipse.ptp.utils.ui.swt.TextGroup;
-import org.eclipse.ptp.utils.ui.swt.TextMold;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * 
- * @author Richard Maciel, Daniel Felix Ferber
- * 
- */
-public class ConfigurationPage extends AbstractEnvironmentDialogPage {
-	ConfigFactory configFactory = null;
-
-	public ConfigurationPage(String targetName, Map attributesMap) {
-		super(targetName);
-
-		/*
-		 * if (targetName == null) { this.targetName =
-		 * Messages.ConfigurationPage_DefaultTargetName; } else {
-		 */
-		this.targetName = targetName;
-		// }
-
-		configFactory = new ConfigFactory(attributesMap);
-	}
-
-	public ConfigurationPage() {
-		super(Messages.ConfigurationPage_DefaultTargetName);
-		this.targetName = Messages.ConfigurationPage_DefaultTargetName;
-
-		configFactory = new ConfigFactory();
-	}
-
-	private String targetName;
-	private TextGroup targetNameGroup;
-	private AuthenticationFrame remoteAuthFrame;
-	private TextGroup systemWorkspaceGroup;
-
-	class DataModifyListener implements ModifyListener {
-		int counter = 0;
-
-		public synchronized void enable() {
-			counter++;
-		}
-
-		public synchronized void disable() {
-			counter--;
-		}
-
-		public synchronized void modifyText(ModifyEvent e) {
-			if (counter < 0) {
-				return;
-			}
-			readControls();
-
-			// updateButtons() will call is Valid(), that will call
-			// validateFields()
-			getContainer().updateButtons();
-		}
-	}
-
-	private DataModifyListener dataModifyListener;
-
-	@Override
-	public void createControl(Composite parent) {
-
-		this.setDescription(Messages.ConfigurationPage_DialogDescription);
-		this.setTitle(Messages.ConfigurationPage_DialogTitle);
-		this.setErrorMessage(null);
-
-		GridLayout topLayout = new GridLayout();
-		final Composite topControl = new Composite(parent, SWT.NONE);
-		setControl(topControl);
-		topControl.setLayout(topLayout);
-
-		/*
-		 * Environment name Label and text controls.
-		 */
-		// TextGroupMold tmold = new
-		// TextGroupMold(TextGroupMold.GRID_DATA_ALIGNMENT_FILL
-		// | TextGroupMold.GRID_DATA_GRAB_EXCESS_SPACE,
-		// Messages.ConfigurationPage_LabelTargetName, TextGroup.MAX_SIZE);
-		TextMold mold = new TextMold(TextMold.GRID_DATA_ALIGNMENT_FILL | TextMold.GRID_DATA_GRAB_EXCESS_SPACE,
-				Messages.ConfigurationPage_LabelTargetName);
-		targetNameGroup = new TextGroup(topControl, mold);
-
-		createAuthControl(topControl);
-
-		/*
-		 * System workspace
-		 */
-		Frame frame = new Frame(topControl, Messages.ConfigurationPage_0);
-		mold = new TextMold(TextMold.GRID_DATA_ALIGNMENT_FILL | TextMold.GRID_DATA_GRAB_EXCESS_SPACE,
-				Messages.ConfigurationPage_LabelSystemWorkspace);
-		systemWorkspaceGroup = new TextGroup(frame.getTopUserReservedComposite(), mold);
-
-		fillControls();
-		registerListeners();
-	}
-
-	private void registerListeners() {
-		dataModifyListener = new DataModifyListener();
-		targetNameGroup.addModifyListener(dataModifyListener);
-		remoteAuthFrame.addModifyListener(dataModifyListener);
-		systemWorkspaceGroup.addModifyListener(dataModifyListener);
-	}
-
-	private void fillControls() {
-		ControlAttributes attributes = configFactory.getAttributes();
-		targetNameGroup.setString(targetName);
-		remoteAuthFrame.setLocalhostSelected(attributes.getBoolean(ConfigFactory.ATTR_LOCALHOST_SELECTION));
-		remoteAuthFrame.setHostPort(attributes.getInteger(ConfigFactory.ATTR_CONNECTION_PORT));
-		remoteAuthFrame.setHostAddress(attributes.getString(ConfigFactory.ATTR_CONNECTION_ADDRESS));
-		remoteAuthFrame.setUserName(attributes.getString(ConfigFactory.ATTR_LOGIN_USERNAME));
-		remoteAuthFrame.setPassword(attributes.getString(ConfigFactory.ATTR_LOGIN_PASSWORD));
-		remoteAuthFrame.setPublicKeyPath(attributes.getString(ConfigFactory.ATTR_KEY_PATH));
-		remoteAuthFrame.setPassphrase(attributes.getString(ConfigFactory.ATTR_KEY_PASSPHRASE));
-		remoteAuthFrame.setTimeout(attributes.getInteger(ConfigFactory.ATTR_CONNECTION_TIMEOUT));
-		remoteAuthFrame.setPasswordBased(attributes.getBoolean(ConfigFactory.ATTR_IS_PASSWORD_AUTH));
-		systemWorkspaceGroup.setString(attributes.getString(ConfigFactory.ATTR_SYSTEM_WORKSPACE));
-
-		// Fill the combobox with available cipher types
-		Map cipherMap = TargetControl.getCipherTypesMap();
-		Set cKeySet = cipherMap.keySet();
-		ComboGroup cipherGroup = remoteAuthFrame.getCipherTypeGroup();
-		for (Iterator it = cKeySet.iterator(); it.hasNext();) {
-			String key = (String) it.next();
-			String value = (String) cipherMap.get(key);
-
-			cipherGroup.add(new ComboGroupItem(key, value));
-		}
-		// Select the cipher type based on the attributes map.
-		cipherGroup.selectIndexUsingID(attributes.getString(ConfigFactory.ATTR_CIPHER_TYPE));
-
-		// org.eclipse.ptp.remotetools.internal.ssh.systemWorkspaceGroup.setString(attributes.getString(ConfigFactory.ATTR_SYSTEM_WORKSPACE));
-	}
-
-	private void readControls() {
-		ControlAttributes attributes = configFactory.getAttributes();
-		targetName = targetNameGroup.getString();
-		attributes.setBooleanAttribute(ConfigFactory.ATTR_LOCALHOST_SELECTION, remoteAuthFrame.isLocalhostSelected());
-		attributes.setStringAttribute(ConfigFactory.ATTR_LOGIN_USERNAME, remoteAuthFrame.getUserName());
-		attributes.setStringAttribute(ConfigFactory.ATTR_LOGIN_PASSWORD, remoteAuthFrame.getPassword());
-		attributes.setStringAttribute(ConfigFactory.ATTR_CONNECTION_ADDRESS, remoteAuthFrame.getHostAddress());
-		attributes.setStringAttribute(ConfigFactory.ATTR_CONNECTION_PORT, Integer.toString(remoteAuthFrame.getHostPort()));
-		attributes.setStringAttribute(ConfigFactory.ATTR_KEY_PATH, remoteAuthFrame.getPublicKeyPath());
-		attributes.setStringAttribute(ConfigFactory.ATTR_KEY_PASSPHRASE, remoteAuthFrame.getPassphrase());
-		attributes.setStringAttribute(ConfigFactory.ATTR_CONNECTION_TIMEOUT, Integer.toString(remoteAuthFrame.getTimeout()));
-		attributes.setBooleanAttribute(ConfigFactory.ATTR_IS_PASSWORD_AUTH, remoteAuthFrame.isPasswordBased());
-		attributes.setStringAttribute(ConfigFactory.ATTR_SYSTEM_WORKSPACE, systemWorkspaceGroup.getString());
-		attributes.setStringAttribute(ConfigFactory.ATTR_CIPHER_TYPE, remoteAuthFrame.getSelectedCipherType().getId());
-	}
-
-	private void createAuthControl(Composite topControl) {
-		AuthenticationFrameMold amold = new AuthenticationFrameMold(Messages.ConfigurationPage_ConnectionFrameTitle);
-		amold.setBitmask(AuthenticationFrameMold.SHOW_HOST_TYPE_RADIO_BUTTON);
-		amold.setLabelLocalhost(Messages.ConfigurationPage_LabelLocalhost);
-		amold.setLabelRemoteHost(Messages.ConfigurationPage_LabelRemoteHost);
-		amold.setLabelHideAdvancedOptions(Messages.ConfigurationPage_LabelHideAdvancedOptions);
-		amold.setLabelHostAddress(Messages.ConfigurationPage_LabelHostAddress);
-		amold.setLabelHostPort(Messages.ConfigurationPage_LabelHostPort);
-		amold.setLabelIsPasswordBased(Messages.ConfigurationPage_LabelIsPasswordBased);
-		amold.setLabelIsPublicKeyBased(Messages.ConfigurationPage_LabelIsPublicKeyBased);
-		amold.setLabelPassphrase(Messages.ConfigurationPage_LabelPassphrase);
-		amold.setLabelPassword(Messages.ConfigurationPage_LabelPassword);
-		amold.setLabelPublicKeyPath(Messages.ConfigurationPage_LabelPublicKeyPath);
-		amold.setLabelPublicKeyPathButton(Messages.ConfigurationPage_LabelPublicKeyPathButton);
-		amold.setLabelPublicKeyPathTitle(Messages.ConfigurationPage_LabelPublicKeyPathTitle);
-		amold.setLabelShowAdvancedOptions(Messages.ConfigurationPage_LabelShowAdvancedOptions);
-		amold.setLabelTimeout(Messages.ConfigurationPage_LabelTimeout);
-		amold.setLabelCipherType(Messages.ConfigurationPage_CipherType);
-		amold.setLabelUserName(Messages.ConfigurationPage_LabelUserName);
-
-		this.remoteAuthFrame = new AuthenticationFrame(topControl, amold);
-		// remoteAuthFrame.setLayoutData(new GridData(GridData.FILL_BOTH |
-		// GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL));
-		// remoteAuthFrame.addModifyListener(dataModifyListener);
-	}
-
-	@Override
-	public Map getAttributes() {
-		return configFactory.getMap();
-	}
-
-	@Override
-	public boolean isValid() {
-		try {
-			remoteAuthFrame.validateFields();
-			configFactory.createTargetConfig();
-		} catch (CoreException e) {
-			setErrorMessage(e.getMessage());
-			return false;
-		}
-		return true;
-	}
-
-	@Override
-	public String getName() {
-		return targetName;
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/.classpath b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/.classpath
deleted file mode 100755
index 64c5e31..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/.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/remotetools/org.eclipse.ptp.remotetools.environment.launcher/.project b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/.project
deleted file mode 100755
index a59baad..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.remotetools.environment.launcher</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/remotetools/org.eclipse.ptp.remotetools.environment.launcher/.settings/org.eclipse.jdt.core.prefs b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d2cd155..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,8 +0,0 @@
-#Fri Apr 16 12:59:22 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/remotetools/org.eclipse.ptp.remotetools.environment.launcher/META-INF/MANIFEST.MF b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/META-INF/MANIFEST.MF
deleted file mode 100755
index 494fec2..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,37 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.remotetools.environment.launcher;singleton:=true
-Bundle-Version: 2.0.2.qualifier
-Bundle-Activator: org.eclipse.ptp.remotetools.environment.launcher.RemoteLauncherPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.debug.core,
- org.eclipse.debug.ui,
- org.eclipse.cdt.core,
- org.eclipse.cdt.debug.core,
- org.eclipse.cdt.launch,
- org.eclipse.ptp.remotetools.environment.core,
- org.eclipse.swt,
- org.eclipse.ui,
- org.eclipse.ui.console,
- org.eclipse.ptp.remotetools.core,
- org.eclipse.core.variables,
- org.eclipse.cdt.managedbuilder.core,
- org.eclipse.ui.ide,
- org.eclipse.jface.text,
- org.eclipse.core.filesystem,
- org.eclipse.core.resources,
- org.eclipse.ptp.remotetools.utils,
- org.eclipse.ptp.utils.ui;bundle-version="1.0.0",
- org.eclipse.ptp.utils.core;bundle-version="1.0.0"
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.ptp.remotetools.environment.launcher,
- org.eclipse.ptp.remotetools.environment.launcher.core,
- org.eclipse.ptp.remotetools.environment.launcher.data,
- org.eclipse.ptp.remotetools.environment.launcher.macros,
- org.eclipse.ptp.remotetools.environment.launcher.preferences,
- org.eclipse.ptp.remotetools.environment.launcher.ui,
- org.eclipse.ptp.remotetools.environment.launcher.variables
-Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/about.html b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/about.html
deleted file mode 100755
index a78242d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/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>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/build.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/build.properties
deleted file mode 100755
index 647fcc0..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/build.properties
+++ /dev/null

@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               icons/,\
-               plugin.properties

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/iprocess.gif b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/iprocess.gif
deleted file mode 100755
index 4bb3ed5..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/iprocess.gif
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/iprocess.png b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/iprocess.png
deleted file mode 100755
index 107a6e9..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/iprocess.png
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/sync.png b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/sync.png
deleted file mode 100755
index fc9be20..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/sync.png
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/target.png b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/target.png
deleted file mode 100755
index 3d5868f..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/icons/target.png
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/plugin.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/plugin.properties
deleted file mode 100755
index 1afc4d7..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/plugin.properties
+++ /dev/null

@@ -1,16 +0,0 @@
-###############################################################################
-# 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
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-
-pluginName=PTP Remote Tools Application Launcher
-pluginProvider=Eclipse.org
-
-# Eclipse variables description
-UserWorkspaceVariableDescription=A dynamic variable that indicates from where a connection to a remote system comes from/
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/plugin.xml b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/plugin.xml
deleted file mode 100755
index 97bc93c..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/plugin.xml
+++ /dev/null

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension-point id="observer" name="org.eclipse.ptp.remotetools.environment.launcher" schema="schema/launcherObserver.exsd"/>
-
-	<extension-point
-			id="launchConfigurationMacroSupplier"
-			name="Launch Configuration Macro Supplier"
-			schema="schema/launchConfigurationMacroSupplier.exsd">
-	</extension-point>
-   
-	<extension
-			point="org.eclipse.core.variables.dynamicVariables">
-		<variable
-				name="user_workspace"
-				description="%UserWorkspaceVariableDescription"
-				resolver="org.eclipse.ptp.remotetools.environment.launcher.variables.RemoteWorkspaceResolver">
-		</variable>
-	</extension>
- <extension
-       point="org.eclipse.core.runtime.preferences">
-    <initializer class="org.eclipse.ptp.remotetools.environment.launcher.preferences.PreferenceInitializer"/>
- </extension>
- <extension
-       point="org.eclipse.ui.preferencePages">
-    <page
-          category="org.eclipse.ptp.remotetools.preferences.ui.RemoteToolsPreferencePage"
-          class="org.eclipse.ptp.remotetools.environment.launcher.preferences.LauncherPreferencePage"
-          id="org.eclipse.ptp.remotetools.environment.launcher.LauncherPreferencePage"
-          name="Launcher"/>
- </extension>
-
-</plugin>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/schema/launchConfigurationMacroSupplier.exsd b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/schema/launchConfigurationMacroSupplier.exsd
deleted file mode 100755
index 4d17ec5..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/schema/launchConfigurationMacroSupplier.exsd
+++ /dev/null

@@ -1,124 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ptp.remotetools.environment.launcher">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ptp.remotetools.environment.launcher" id="launchConfigurationMacroSupplier" name="Launch Configuration Macro Supplier"/>
-      </appInfo>
-      <documentation>
-         This extension point allows to contribute with new Launch Macro Suppliers to a specific Launcher Delegate.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="launchConfigurationMacroSupplier"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A fully qualified identifier of the target extension point.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  An optional identifier of the extension instance.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  An optional name of the extension instance.
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="launchConfigurationMacroSupplier">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Id of this Launch Configuration Macro Supplier.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="configTypeId" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The Launch Configuration Type to which this Launch Configuration Macro Supplier is related to.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The class that implements org.eclipse.ptp.remotetools.environment.launcher.macros.ILaunchConfigurationMacroSupplier.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.ptp.remotetools.environment.launcher.macros.ILaunchConfigurationMacroSupplier"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         2.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The classes referenced by this extension point must implement the ILaunchConfigurationMacroSupplier.
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2006 IBM Corporation.&lt;br&gt;
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;&lt;br&gt;
-Contributors:&lt;br&gt;
-    IBM Corporation - initial implementation
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/schema/launcherObserver.exsd b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/schema/launcherObserver.exsd
deleted file mode 100755
index 7493290..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/schema/launcherObserver.exsd
+++ /dev/null

@@ -1,119 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ptp.remotetools.environment.launcher">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ptp.remotetools.environment.launcher" id="observer" name="launcherObserver"/>
-      </appInfo>
-      <documentation>
-         Implements an observer that receives STDOUT from a remote application.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="observer"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="observer">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchObserver"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         2.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/RemoteLauncherPlugin.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/RemoteLauncherPlugin.java
deleted file mode 100755
index b2efc63..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/RemoteLauncherPlugin.java
+++ /dev/null

@@ -1,121 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.launcher;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchIntegration;
-import org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchObserver;
-import org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchProcess;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ExecutionConfiguration;
-import org.eclipse.ptp.remotetools.environment.launcher.internal.LaunchObserverIterator;
-import org.eclipse.ptp.remotetools.environment.launcher.internal.RemoteLaunchProcess;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class RemoteLauncherPlugin extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ptp.remotetools.environment.launcher"; //$NON-NLS-1$
-	public static final String OBERVER_EXTENSION_ID = "org.eclipse.ptp.remotetools.environment.launcher.observer"; //$NON-NLS-1$
-
-	// The shared instance
-	private static RemoteLauncherPlugin plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public RemoteLauncherPlugin() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static RemoteLauncherPlugin getDefault() {
-		return plugin;
-	}
-
-	public static String getUniqueIdentifier() {
-		if (getDefault() == null) {
-			// If the default instance is not yet initialized,
-			// return a static identifier. This identifier must
-			// match the plugin id defined in plugin.xml
-			return PLUGIN_ID;
-		}
-		return getDefault().getBundle().getSymbolicName();
-	}
-	
-	public static LaunchObserverIterator getLaunchObserverIterator() {
-		return new LaunchObserverIterator();
-	}
-	
-	public static ILaunchObserver getLaunchObserverByID(String id) {
-		if (id == null) return null;
-		LaunchObserverIterator iterator = getLaunchObserverIterator();
-		while (iterator.hasMoreElements()) {
-			iterator.nextElement();
-			if (iterator.getName().equals(id)) {
-				return iterator.getInstance();
-			}
-		}
-		return null;
-	}
-
-	public static void throwCoreException(String message) throws CoreException {
-		Status status = new Status(IStatus.ERROR, PLUGIN_ID, 0, message, null);
-		CoreException exception = new CoreException(status);
-		throw exception;
-	}
-
-	public static void throwCoreException(String message, int errorCode) throws CoreException {
-		Status status = new Status(IStatus.ERROR, PLUGIN_ID, errorCode, message, null);
-		CoreException exception = new CoreException(status);
-		throw exception;
-	}
-	
-	public static ILaunchProcess createRemoteLaunchProcess(ILaunch launch, ExecutionConfiguration configuration, ILaunchIntegration launchIntegration) {
-		return new RemoteLaunchProcess(launch, configuration, launchIntegration);
-	}
-
-	public static void throwCoreException(String message, RemoteConnectionException e) throws CoreException {
-		Status status = new Status(IStatus.ERROR, PLUGIN_ID, 0, message, e);
-		CoreException exception = new CoreException(status);
-		throw exception;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchIntegration.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchIntegration.java
deleted file mode 100755
index 3cfe0ed..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchIntegration.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-
-
-/**
- * Provides implementation of additional operations that are required to launch the application.
- * The most important purpose is to provide the command line(s) that launch the application.
- * It has the opportunity to collaborate with customization on any step of the launch.
- * @author Daniel Felix Ferber
- */
-public interface ILaunchIntegration {
-	public void prepareUploadWorkingDir() throws CoreException, CancelException;
-	public void finishUploadWorkingDir() throws CoreException, CancelException;
-	public void prepareApplication() throws CoreException, CancelException;
-	public void finalizeApplication() throws CoreException, CancelException;
-	public void finalizeWorkingDir() throws CoreException, CancelException;	
-	public void finalizeCleanup() throws CoreException, CancelException;	
-	
-	public void prepareLaunch() throws CoreException, CancelException;
-	public void finalizeLaunch() throws CoreException, CancelException;
-	
-	/**
-	 * The command line used to launch the application.
-	 * Used to customize how the application shall be launched.
-	 * Typically, the command line also launches a debugger or a profiler tool.
-	 * @param applicationFullPath Full path where the application executable is stored on the remote host.
-	 * @param arguments Parameters that shall be passed to the application.
-	 * @return An array of strings, each element is a line of the script.
-	 * @throws CoreException
-	 */
-	public String [] createLaunchScript(String applicationFullPath, String[] arguments) throws CoreException;
-	/**
-	 * Query if the application shall be launched. 
-	 * By default, the launcher uploads and executes the application.
-	 * Return false to implement an "attach to remote process" feature.
-	 * @return true/false
-	 * @throws CoreException
-	 */
-	public boolean getDoLaunchApplication() throws CoreException;
-	
-	/**
-	 * Notifies the launch integration that the lauch has just started.
-	 * @throws CoreException
-	 */
-	public void start() throws CoreException;
-	/**
-	 * Notifies the launch integration that the lauch is going to finish.
-	 * @throws CoreException
-	 */
-	public void finish() throws CoreException;
-	/**
-	 * Notifies the launch integration which execution manager is being used to
-	 * run commands on the remote host.
-	 * @throws CoreException
-	 */
-
-	public void setExecutionManager(IRemoteExecutionManager manager);
-	/**
-	 * Notifies the launch integration that the lauch is going to clean up the remote working directory.
-	 * @throws CoreException
-	 */
-
-	public void cleanup();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchObserver.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchObserver.java
deleted file mode 100755
index 7f5360d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchObserver.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.launcher.core;
-
-/**
- * A listener that receives the application output and allows adding customization steps.
- * The launch observers are defined by extension points.
- * The user can select one launch observer to observer de application execution.
- * @author Daniel Felix Ferber
- */
-public interface ILaunchObserver extends ILaunchIntegration {
-	void receiveOutput(String text);
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchProcess.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchProcess.java
deleted file mode 100755
index fc0b063..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchProcess.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.core;
-
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ExecutionConfiguration;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ExecutionResult;
-
-
-/**
- * Definition of the remote launch.
- * @author Daniel Felix Ferber
- *
- */
-public interface ILaunchProcess  {
-	public void addProgressListener(ILaunchProgressListener progressListener);
-	public void removeProgressListener(ILaunchProgressListener progressListener);
-	
-	public void setLaunchObserver(ILaunchObserver launchObserver);
-	
-	public ILaunchObserver getObserver();
-	public ILaunchIntegration getLaunchIntegration();
-	public ExecutionConfiguration getConfiguration();
-	public IRemoteExecutionManager getExecutionManager();
-	public ILaunchConfiguration getLaunchConfiguration();
-	
-	public int getCurrentProgress();
-	public ExecutionResult getFinalResult();
-
-	public ILaunch getLaunch();
-	
-	public void run(IRemoteExecutionManager manager);
-	public void markAsCanceled();
-	
-	public void showProcessConsole();
-	public void showLaunchConsole();
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchProgressListener.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchProgressListener.java
deleted file mode 100755
index 37fa60c..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/ILaunchProgressListener.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.launcher.core;
-
-/**
- * A listener that is called each time the launch advances one step.
- * Useful for updating the progress bar.
- * @author Daniel Felix Ferber
- */
-public interface ILaunchProgressListener {
-	// Launch progress
-	public static final int UNDEFINED = 0;
-	public static final int WAIT = 1;
-	public static final int PREPARE_WORKING_DIR1 = 2;
-	public static final int UPLOAD_WORKING_DIR = 3;
-	public static final int PREPARE_WORKING_DIR2 = 4;
-	public static final int UPLOAD_APPLICATION = 5;
-	public static final int PREPARE_APPLICATION = 6;
-	public static final int RUNNING = 7;
-	public static final int FINALIZE_APPLICATION = 8;
-	public static final int DOWNLOAD_WORKING_DIR = 9;
-	public static final int FINALIZE_WORKING_DIR2 = 10;
-	public static final int CLEANUP = 11;
-	public static final int FINALIZE_CLEANUP = 12;
-	public static final int FINISHED = 13;
-	void notifyProgress(int progress);
-	void notifyInterrupt();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/IRemoteLaunchAttributes.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/IRemoteLaunchAttributes.java
deleted file mode 100755
index a423816..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/IRemoteLaunchAttributes.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.launcher.core;
-
-/**
- * Definition of key names and default values that are used by the launcher.
- * @author Daniel Felix Ferber
- */
-public interface IRemoteLaunchAttributes {
-	public static final String LAUNCH_ID = "org.eclipse.ptp.remotetools.environment.launcher.core"; //$NON-NLS-1$
-	
-	public static final String ATTR_AUTOMATIC_WORKING_DIRECTORY = LAUNCH_ID + ".AUTO_REMOTE_DIRECTORY"; //$NON-NLS-1$
-	public static final String ATTR_REMOTE_DIRECTORY = LAUNCH_ID + ".REMOTE_DIRECTORY"; //$NON-NLS-1$
-	/** @deprecated */
-	public static final String ATTR_LOCAL_DIRECTORY = LAUNCH_ID + ".LOCAL_DIRECTORY"; //$NON-NLS-1$
-	public static final String ATTR_SYNC_BEFORE = LAUNCH_ID + ".SYNC_BEFORE"; //$NON-NLS-1$
-	public static final String ATTR_SYNC_AFTER = LAUNCH_ID + ".SYNC_AFTER"; //$NON-NLS-1$
-	public static final String ATTR_SYNC_CLEANUP = LAUNCH_ID + ".SYNC_CLEANUP"; //$NON-NLS-1$
-	public static final String ATTR_USE_FORWARDED_X11 = LAUNCH_ID + ".FORWARD_X11"; //$NON-NLS-1$
-	public static final String ATTR_OUTPUT_OBSERVER = LAUNCH_ID + ".OUTPUT_OBSERVER";  //$NON-NLS-1$
-	public static final String ATTR_BEFORE_COMMAND = LAUNCH_ID + ".BEFORE_COMMAND";  //$NON-NLS-1$
-	public static final String ATTR_AFTER_COMMAND = LAUNCH_ID + ".AFTER_COMMAND"; //$NON-NLS-1$
-	public static final String ATTR_SYNC_RULES = LAUNCH_ID + ".SYNC_RULES"; //$NON-NLS-1$
-	
-	public static final boolean DEFAULT_AUTOMATIC_WORKING_DIRECTORY = true;
-	public static final String DEFAULT_LOCAL_DIRECTORY = ""; //$NON-NLS-1$
-	public static final boolean DEFAULT_SYNC_BEFORE = true;
-	public static final boolean DEFAULT_SYNC_AFTER = true;
-	public static final boolean DEFAULT_SYNC_CLEANUP = true;
-	public static final boolean DEFAULT_USE_FORWARDED_X11 = false;
-	public static final String DEFAULT_AFTER_COMMAND = null;
-	public static final String DEFAULT_BEFORE_COMMAND = null;
-	public static final String DEFAULT_OUTPUT_OBSERVER = null;
-	public static final String DEFAULT_BEFORE_FILES = ""; //$NON-NLS-1$
-	public static final String DEFAULT_AFTER_FILES = ""; //$NON-NLS-1$
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/IRemoteLaunchErrors.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/IRemoteLaunchErrors.java
deleted file mode 100755
index 13ebbc3..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/IRemoteLaunchErrors.java
+++ /dev/null

@@ -1,18 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.core;
-
-public interface IRemoteLaunchErrors {
-	public static int INVALID_RULE = 1;
-	public static int INVALID_EXECUTION_CONFIGURATION = 2;
-	public static int ERROR_PARSING_RULE = 3;
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/LinuxPath.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/LinuxPath.java
deleted file mode 100755
index b48c380..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/LinuxPath.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.core;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-public class LinuxPath {
-	public static String toString(IPath path) {
-		return path.toString();
-	}
-
-	public static IPath fromString(String location) {
-		return new Path(location);
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/Messages.java
deleted file mode 100755
index e91585a..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/Messages.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.core;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remotetools.environment.launcher.core.messages"; //$NON-NLS-1$
-
-	public static String RemoteLaunchDelegate_LocalDirectory_DoesNotExist;
-
-	public static String RemoteLaunchDelegate_LocalDirectory_IsNotADirectory;
-
-	public static String RemoteLaunchDelegate_LocalDirectory_Missing;
-
-	public static String RemoteLaunchDelegate_LocalDirectory_MustBeAbsolute;
-
-	public static String RemoteLaunchDelegate_RemoteDirectory_MacroFailed;
-
-	public static String RemoteLaunchDelegate_RemoteDirectory_MacroFailed_Unknown;
-
-	public static String RemoteLaunchDelegate_RemoteDirectory_Missing;
-
-	public static String RemoteLaunchDelegate_RemoteDirectory_MissingInPreferences;
-
-	public static String RemoteLaunchDelegate_RemoteDirectory_MustBeAbsolute;
-
-	public static String ExecutionConfiguration_Error_MissingExecutable;
-
-	public static String ExecutionConfiguration_Error_MissingLocalRemoteDirectory;
-
-	public static String ExecutionConfiguration_Error_MissingProject;
-
-	public static String ExecutionConfiguration_Error_MissingRemoteWorkingDirectory;
-
-	public static String RemoteLaunchDelegate_SynchronizationRules_InternalError;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/NullLaunchIntegration.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/NullLaunchIntegration.java
deleted file mode 100755
index adaa5db..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/NullLaunchIntegration.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.environment.launcher.internal.RemoteLaunchProcess;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-
-
-/**
- * A dummy void launch integration that can be used as base class for further specialization.
- * @author Daniel Felix Ferber
- */
-public class NullLaunchIntegration implements ILaunchIntegration {
-
-	public String[] createLaunchScript(String applicationFullPath, String[] arguments) throws CoreException {
-		String result [] = new String [1];
-		result[0] = RemoteLaunchProcess.createCommandLine(applicationFullPath, arguments);
-		return result;
-	}
-
-	public void cleanup() {
-	}
-
-	public void finalizeCleanup() throws CoreException, CancelException {
-	}
-
-	public void finalizeApplication() throws CoreException, CancelException {
-	}
-
-	public void finalizeWorkingDir() throws CoreException, CancelException {
-	}
-
-	public void finish() throws CoreException {
-	}
-
-	public void finishUploadWorkingDir() throws CoreException, CancelException {
-	}
-
-	public void prepareApplication() throws CoreException, CancelException {
-	}
-
-	public void prepareUploadWorkingDir() throws CoreException, CancelException {
-	}
-
-	public void setExecutionManager(IRemoteExecutionManager manager) {
-	}
-
-	public void start() throws CoreException {
-	}
-
-	public boolean getDoLaunchApplication() throws CoreException {
-		return true;
-	}
-
-	public void finalizeLaunch() throws CoreException, CancelException {
-	}
-
-	public void prepareLaunch() throws CoreException, CancelException {
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/RemoteLaunchDelegate.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/RemoteLaunchDelegate.java
deleted file mode 100755
index b86ebaa..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/RemoteLaunchDelegate.java
+++ /dev/null

@@ -1,518 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.core;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.cdt.core.model.ICProject;
-import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
-import org.eclipse.cdt.launch.AbstractCLaunchDelegate;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.remotetools.environment.launcher.RemoteLauncherPlugin;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ISynchronizationRule;
-import org.eclipse.ptp.remotetools.environment.launcher.data.RuleFactory;
-import org.eclipse.ptp.remotetools.environment.launcher.internal.integration.NullLaunchObserver;
-import org.eclipse.ptp.remotetools.environment.launcher.internal.macros.LaunchVariableManager;
-import org.eclipse.ptp.remotetools.environment.launcher.macros.ILaunchVariableContextInfo;
-import org.eclipse.ptp.remotetools.environment.launcher.preferences.LaunchPreferences;
-
-/**
- * Implementation of utility methods to retrieve information from a remote
- * launch configuration.
- * 
- * @author Daniel Felix Ferber
- */
-public abstract class RemoteLaunchDelegate extends AbstractCLaunchDelegate {
-
-	protected static final String EMPTY_STRING = ""; //$NON-NLS-1$
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.cdt.launch.AbstractCLaunchDelegate#getPluginID()
-	 */
-	@Override
-	public String getPluginID() {
-		return RemoteLauncherPlugin.getUniqueIdentifier();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.debug.core.model.ILaunchConfigurationDelegate2#finalLaunchCheck
-	 * (org.eclipse.debug.core.ILaunchConfiguration, java.lang.String,
-	 * org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	@Override
-	public boolean finalLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException {
-		return super.finalLaunchCheck(configuration, mode, monitor);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.debug.core.model.ILaunchConfigurationDelegate2#preLaunchCheck
-	 * (org.eclipse.debug.core.ILaunchConfiguration, java.lang.String,
-	 * org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	@Override
-	public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException {
-		return super.preLaunchCheck(configuration, mode, monitor);
-	}
-
-	/**
-	 * Returns the <b>local</b> working directory of the launch configuration.
-	 * 
-	 * If the local working directory is not specified in the launch
-	 * configuration, the the project directory is assumed as fallback.
-	 * 
-	 * If the directory is not absolute, then it is interpreted as a directory
-	 * relative to the workspace.
-	 * 
-	 * Returns <code>null</code> if no fall back information is available.
-	 * 
-	 * @param configuration
-	 *            launch configuration.
-	 * @return an absolute path to a directory in the remote file system, or
-	 *         <code>null</code> if not available.
-	 * @throws CoreException
-	 *             On failre to retrieve the attributes
-	 * 
-	 * @deprecated This property was removed from the launcher tab.
-	 */
-	@Deprecated
-	protected IPath getLocalDirectoryWithFallback(ILaunchConfiguration configuration) throws CoreException {
-		// ok
-		String location = configuration.getAttribute(IRemoteLaunchAttributes.ATTR_LOCAL_DIRECTORY, (String) null);
-		if (location != null && location.length() == 0) {
-			// Fallback to user project directory
-			ICProject cp = getCProject(configuration);
-			if (cp != null) {
-				IProject p = cp.getProject();
-				return p.getLocation();
-			}
-			return null;
-		}
-
-		IPath path = new Path(location);
-		if (!path.isAbsolute()) {
-			IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(path);
-			return folder.getLocation();
-		}
-
-		return new Path(location);
-	}
-
-	/**
-	 * Returns the verified <b>local</b> working directory specified by the
-	 * given launch configuration.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return the <b>local</b> working directory specified by the given launch
-	 *         configuration
-	 * @exception CoreException
-	 *                <ul>
-	 *                <li>On failure to retrieve the attribute.
-	 *                <li>If not absolute.
-	 *                <li>If the directory does not exist on the local file
-	 *                system.
-	 *                <li>If not a directory on the local file system.
-	 *                </ul>
-	 * @deprecated
-	 */
-	@Deprecated
-	public File getValidatedLocalDirectory(ILaunchConfiguration configuration) throws CoreException {
-		// ok
-
-		IPath path = getLocalDirectoryWithFallback(configuration);
-		if (path == null) {
-			abort(Messages.RemoteLaunchDelegate_LocalDirectory_Missing, null, 0);
-		}
-
-		if (!path.isAbsolute()) {
-			abort(Messages.RemoteLaunchDelegate_LocalDirectory_MustBeAbsolute, null, 0);
-		}
-
-		File directory = path.toFile();
-		if (!directory.exists()) {
-			abort(Messages.RemoteLaunchDelegate_LocalDirectory_DoesNotExist, null, 0);
-		}
-		if (!directory.isDirectory()) {
-			abort(Messages.RemoteLaunchDelegate_LocalDirectory_IsNotADirectory, null, 0);
-		}
-
-		return directory;
-	}
-
-	/**
-	 * Returns the <b>local</b> working directory attribute of the given launch
-	 * configuration. Returns <code>null</code> if a working directory is not
-	 * specified.
-	 * 
-	 * @param configuration
-	 *            launch configuration.
-	 * @return an absolute path to a directory in the remote file system, or
-	 *         <code>null</code> if unspecified.
-	 * @throws CoreException
-	 *             On failre to retrieve the attributes
-	 * 
-	 * @deprecated This property was removed from the launcher tab.
-	 */
-	@Deprecated
-	public IPath getLocalDirectory(ILaunchConfiguration config) throws CoreException {
-		// ok
-		return getLocalDirectoryWithFallback(config);
-	}
-
-	/**
-	 * Returns the <b>remote</b> working directory of the launch configuration.
-	 * No macros are expanded. To expand macros, use
-	 * {@link #getValidatedRemoteDirectory(ILaunchConfiguration)}.
-	 * 
-	 * @param configuration
-	 *            The launch configuration.
-	 * @return path to a directory in the remote file system, or
-	 *         <code>null</code> if unspecified.
-	 * @throws CoreException
-	 *             On failure the get the attribute.
-	 */
-	public IPath getRemoteDirectory(ILaunchConfiguration configuration) throws CoreException {
-		// ok
-		String location = null;
-		if (configuration.getAttribute(IRemoteLaunchAttributes.ATTR_AUTOMATIC_WORKING_DIRECTORY, false)) {
-			location = LaunchPreferences.getPreferenceStore().getString(LaunchPreferences.ATTR_WORKING_DIRECTORY);
-		} else {
-			location = configuration.getAttribute(IRemoteLaunchAttributes.ATTR_REMOTE_DIRECTORY, (String) null);
-		}
-
-		if (location == null) {
-			return null;
-		}
-
-		try {
-			location = LaunchVariableManager.getDefault().resolveValue(location, EMPTY_STRING, EMPTY_STRING,
-					ILaunchVariableContextInfo.CONTEXT_LAUNCH, configuration);
-		} catch (CoreException e) {
-			return null;
-		}
-
-		if (location == null) {
-			return null;
-		}
-		return LinuxPath.fromString(location);
-	}
-
-	/**
-	 * Returns the <b>remote</b> working directory of the launch configuration.
-	 * 
-	 * 
-	 * @param configuration
-	 *            The launch configuration.
-	 * @return path to a directory in the remote file system, or
-	 *         <code>null</code> if unspecified.
-	 * @throws CoreException
-	 * @throws CoreException
-	 *             <ul>
-	 *             <li>On failure the get the attribute.
-	 *             <li>On failure to resolve macros
-	 *             <li>If the path is not absolure.
-	 *             </ul>
-	 */
-	public IPath getValidatedRemoteDirectory(ILaunchConfiguration configuration) throws CoreException {
-		// ok
-		String location = null;
-		if (configuration.getAttribute(IRemoteLaunchAttributes.ATTR_AUTOMATIC_WORKING_DIRECTORY, false)) {
-			location = LaunchPreferences.getPreferenceStore().getString(LaunchPreferences.ATTR_WORKING_DIRECTORY);
-			if (location == null || location.length() == 0) {
-				abort(Messages.RemoteLaunchDelegate_RemoteDirectory_MissingInPreferences, null, 0);
-			}
-		} else {
-			location = configuration.getAttribute(IRemoteLaunchAttributes.ATTR_REMOTE_DIRECTORY, (String) null);
-			if (location == null || location.length() == 0) {
-				abort(Messages.RemoteLaunchDelegate_RemoteDirectory_Missing, null, 0);
-			}
-		}
-		try {
-			location = LaunchVariableManager.getDefault().resolveValue(location, EMPTY_STRING, EMPTY_STRING,
-					ILaunchVariableContextInfo.CONTEXT_LAUNCH, configuration);
-		} catch (CoreException e) {
-			abort(NLS.bind(Messages.RemoteLaunchDelegate_RemoteDirectory_MacroFailed, e.getMessage()), e, 0);
-		}
-		if (location == null) {
-			abort(Messages.RemoteLaunchDelegate_RemoteDirectory_MacroFailed_Unknown, null, 0);
-		}
-		IPath path = LinuxPath.fromString(location);
-		if (!path.isAbsolute()) {
-			abort(Messages.RemoteLaunchDelegate_RemoteDirectory_MustBeAbsolute, null, 0);
-		}
-		return path;
-	}
-
-	/**
-	 * Return whether synchronization before launch is activated in the launch
-	 * configuration.
-	 * 
-	 * @param configuration
-	 *            The launch configuration
-	 * @return True/False.
-	 * 
-	 * @throws CoreException
-	 *             On failure the get the attribute.
-	 */
-	public boolean getSynchronizeBefore(ILaunchConfiguration configuration) throws CoreException {
-		// ok
-		return configuration.getAttribute(IRemoteLaunchAttributes.ATTR_SYNC_BEFORE, IRemoteLaunchAttributes.DEFAULT_SYNC_BEFORE);
-	}
-
-	/**
-	 * Return whether synchronization after launch is activated in the launch
-	 * configuration.
-	 * 
-	 * @param configuration
-	 *            The launch configuration
-	 * @return True/False.
-	 * 
-	 * @throws CoreException
-	 *             On failure the get the attribute.
-	 */
-	public boolean getSynchronizeAfter(ILaunchConfiguration configuration) throws CoreException {
-		// ok
-		return configuration.getAttribute(IRemoteLaunchAttributes.ATTR_SYNC_AFTER, IRemoteLaunchAttributes.DEFAULT_SYNC_AFTER);
-	}
-
-	/**
-	 * Return whether X11 forwarding is activated in the launch configuration.
-	 * 
-	 * @param configuration
-	 *            The launch configuration
-	 * @return True/False.
-	 * 
-	 * @throws CoreException
-	 *             On failure the get the attribute.
-	 */
-	public boolean getUseForwardedX11(ILaunchConfiguration configuration) throws CoreException {
-		// ok
-		return configuration.getAttribute(IRemoteLaunchAttributes.ATTR_USE_FORWARDED_X11,
-				IRemoteLaunchAttributes.DEFAULT_USE_FORWARDED_X11);
-	}
-
-	/**
-	 * Return the observer plug-in that will parse output of the launch
-	 * configuration.
-	 * 
-	 * @param configuration
-	 *            The launch configuration.
-	 * @return The observer plug-in or a void observer if no was selected.
-	 * @throws CoreException
-	 *             If the given observer does not exist. On failure the get the
-	 *             attribute.
-	 */
-	public ILaunchObserver getOutputObserver(ILaunchConfiguration configuration) throws CoreException {
-		// ok
-		String id = configuration.getAttribute(IRemoteLaunchAttributes.ATTR_OUTPUT_OBSERVER, (String) null);
-		if (id == null) {
-			return new NullLaunchObserver();
-		}
-
-		ILaunchObserver launchObserver = RemoteLauncherPlugin.getLaunchObserverByID(id);
-		if (launchObserver == null) {
-			return new NullLaunchObserver();
-		}
-		return launchObserver;
-	}
-
-	// not needed anymore.
-	// protected static void throwsCoreException(String message, Throwable
-	// exception, int code) throws CoreException {
-	// MultiStatus status = new MultiStatus(Activator.getUniqueIdentifier(),
-	// code, message, exception);
-	//		status.add(new Status(IStatus.ERROR, Activator.getUniqueIdentifier(), code, exception == null ? "" : exception.getLocalizedMessage(), //$NON-NLS-1$
-	// exception));
-	// throw new CoreException(status);
-	// }
-
-	public String getBeforeCommand(ILaunchConfiguration configuration) {
-		// ok
-		try {
-			return configuration.getAttribute(IRemoteLaunchAttributes.ATTR_BEFORE_COMMAND, (String) null);
-		} catch (CoreException e) {
-			return null;
-		}
-	}
-
-	public String getAfterCommand(ILaunchConfiguration configuration) {
-		// ok
-		try {
-			return configuration.getAttribute(IRemoteLaunchAttributes.ATTR_AFTER_COMMAND, (String) null);
-		} catch (CoreException e) {
-			return null;
-		}
-	}
-
-	// not used anymore
-	// protected String getRemoteRelativePath(ILaunchConfiguration
-	// configuration, String path) throws CoreException {
-	// IPath base = getRemoteDirectory(configuration);
-	// if (path == null) {
-	// return base.toString();
-	// } else if (isRemoteAbsolutePath(path)) {
-	// return path;
-	// } else {
-	// if (base == null) {
-	// abort(
-	// "Synchronization of remote files with relative paths are is not allowed without specifying remote working directory",
-	// new FileNotFoundException(base.toOSString()),
-	// ICDTLaunchConfigurationConstants.ERR_WORKING_DIRECTORY_DOES_NOT_EXIST
-	// );
-	// }
-	// return concatenateRemotePath(LinuxPath.toString(base), path);
-	// }
-	// }
-
-	// protected String getLocalRelativePath(ILaunchConfiguration configuration,
-	// String path) throws CoreException {
-	// if (path == null) {
-	// return null;
-	// } else {
-	// return getLocalRelativePath(configuration, new Path(path));
-	// }
-	// }
-
-	// protected String getLocalRelativePath(ILaunchConfiguration configuration,
-	// IPath path) throws CoreException {
-	// if (path == null) {
-	// return null;
-	// } else if (path.isAbsolute()) {
-	// return path.toOSString();
-	// } else {
-	// IPath base = getLocalDirectory(configuration);
-	// if (base == null) {
-	// abort(
-	// "Synchronization of local files with relative paths are is not allowed without specifying local working directory or project",
-	// new FileNotFoundException(base.toString()),
-	// ICDTLaunchConfigurationConstants.ERR_WORKING_DIRECTORY_DOES_NOT_EXIST
-	// );
-	// }
-	// IPath basePath = new Path(base.toString());
-	// return basePath.append(path).toOSString();
-	// }
-	// }
-
-	protected boolean getSynchronizeCleanup(ILaunchConfiguration configuration) {
-		boolean result;
-		try {
-			result = configuration.getAttribute(IRemoteLaunchAttributes.ATTR_SYNC_CLEANUP,
-					IRemoteLaunchAttributes.DEFAULT_SYNC_CLEANUP);
-			return result;
-		} catch (CoreException e) {
-			return false;
-		}
-	}
-
-	protected static boolean getAllocateTerminal(ILaunchConfiguration configuration) {
-		boolean result;
-		try {
-			result = configuration.getAttribute(ICDTLaunchConfigurationConstants.ATTR_USE_TERMINAL,
-					ICDTLaunchConfigurationConstants.USE_TERMINAL_DEFAULT);
-			return result;
-		} catch (CoreException e) {
-			return false;
-		}
-	}
-
-	// private String concatenateRemotePath(String sp1, String sp2) {
-	// IPath p = new Path(sp1);
-	// p = p.append(sp2);
-	//
-	// return p.toOSString();
-	// }
-
-	// private String parentOfRemotePath(String spath) {
-	// IPath p = new Path(spath);
-	// p = p.removeLastSegments(1);
-	// return p.toOSString();
-	// }
-	//
-	// private String suffixOfRemotePath(String path) {
-	// if (isRemoteDirectoryPath(path)) {
-	// return null;
-	// } else {
-	// int index = path.lastIndexOf('/');
-	// if (index == -1) return null;
-	// return removeTrailingSlash(path.substring(index));
-	// }
-	// }
-	//
-	// private String addTrailingSlash(String path) {
-	// if (path.endsWith("/")) {
-	// return path;
-	// } else {
-	// return path + "/";
-	// }
-	// }
-
-	// private String removeTrailingSlash(String path) {
-	// if (path.endsWith("/")) {
-	// return path.substring(0, path.length() - 1);
-	// } else {
-	// return path;
-	// }
-	// }
-	//
-	// private boolean isRemoteDirectoryPath(String path) {
-	// return path.endsWith("/");
-	// }
-	//
-	// private boolean isRemoteAbsolutePath(String path) {
-	// return path.startsWith("/");
-	// }
-
-	// public void launch(ILaunchConfiguration configuration, String mode,
-	// ILaunch launch, IProgressMonitor monitor) throws CoreException {
-	//
-	// }
-	/**
-	 * Returns the (possible empty) list of synchronization rule objects
-	 * according to the rules described in the configuration.
-	 */
-	protected ISynchronizationRule[] getSynchronizeRules(ILaunchConfiguration configuration) throws CoreException {
-		List ruleStrings = configuration.getAttribute(IRemoteLaunchAttributes.ATTR_SYNC_RULES, new ArrayList());
-		List result = new ArrayList();
-
-		for (Iterator iter = ruleStrings.iterator(); iter.hasNext();) {
-			String element = (String) iter.next();
-			try {
-				ISynchronizationRule rule = RuleFactory.createRuleFromString(element);
-				result.add(rule);
-			} catch (RuntimeException e) {
-				abort(Messages.RemoteLaunchDelegate_SynchronizationRules_InternalError, e, IRemoteLaunchErrors.ERROR_PARSING_RULE);
-			}
-		}
-
-		return (ISynchronizationRule[]) result.toArray(new ISynchronizationRule[result.size()]);
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/messages.properties
deleted file mode 100755
index e0867ef..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/core/messages.properties
+++ /dev/null

@@ -1,24 +0,0 @@
-###############################################################################
-# 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
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-RemoteLaunchDelegate_LocalDirectory_Missing=Missing value for local working directory.
-RemoteLaunchDelegate_RemoteDirectory_Missing=The value for remote working directory is missing.
-RemoteLaunchDelegate_LocalDirectory_MustBeAbsolute=The local working directory must be an absolute path.
-RemoteLaunchDelegate_LocalDirectory_DoesNotExist=The local working directory does not exist.
-RemoteLaunchDelegate_RemoteDirectory_MacroFailed=Failed to resolve macros for remote working directory
-RemoteLaunchDelegate_LocalDirectory_IsNotADirectory=The local working directory is not a path to a directory.
-RemoteLaunchDelegate_RemoteDirectory_MissingInPreferences=The default value for remote working directory is missing in the preferences for Remote Tools Application Launcher.
-RemoteLaunchDelegate_RemoteDirectory_MacroFailed_Unknown=Failed to resolve macros for remote working directory (unknown reason).
-RemoteLaunchDelegate_RemoteDirectory_MustBeAbsolute=The remote working directory must be an absolute path.
-ExecutionConfiguration_Error_MissingProject=No project specified for remote launch.
-ExecutionConfiguration_Error_MissingExecutable=No executable specified for remote launch.
-ExecutionConfiguration_Error_MissingRemoteWorkingDirectory=No remote working directory specified for remote launch.
-ExecutionConfiguration_Error_MissingLocalRemoteDirectory=No local working directory specified for remote launch.
-RemoteLaunchDelegate_SynchronizationRules_InternalError=Internal error while reading synchronization rule from launch configuration.

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/DownloadRule.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/DownloadRule.java
deleted file mode 100755
index 93f0f18..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/DownloadRule.java
+++ /dev/null

@@ -1,399 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.data;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.ptp.remotetools.environment.launcher.RemoteLauncherPlugin;
-import org.eclipse.ptp.remotetools.environment.launcher.core.IRemoteLaunchErrors;
-
-/*
- * Represents an upload rule.
- * It describes how to copy a list of local files or local directories into a single remote directory.
- * A local file is copied into the remote directory.
- * A local directory has its content copied recursively into the remote directory.
- */
-public class DownloadRule implements ISynchronizationRule {
-	private int overwritePolicy = OverwritePolicies.UNKNOWN;
-
-	private boolean asReadOnly = false;
-	private boolean asExecutable = false;
-	private boolean preserveTimeStamp = false;
-	
-	/** Local destiny directory where the files are downloaded into. */
-	private String localDirectory = null;
-	
-	/**
-	 * List of remote source paths, represented as strings.
-	 * They may be files or directories.
-	 */
-	private List remoteFileList = new ArrayList();
-
-	/*
-	 * Default constructor.
-	 */
-	public DownloadRule() {
-
-	}
-
-	/*
-	 * Creates de rule from a serialized string.
-	 */
-	public DownloadRule(String data) {
-		/*
-		 * Split the string into lines.
-		 */
-		String list[] = data.split("\n"); //$NON-NLS-1$
-		/*
-		 * Check if the first token is the proper identifier. If not, the string does not represent a rule that
-		 * can be parsed by this class.
-		 */
-		{
-			if (list.length < 1) {
-				throwError("The string is not a valid rule for "+this.getClass().getName()); //$NON-NLS-1$
-			}
-			String s = list[0];
-			if (! s.equalsIgnoreCase(SerializationKeys.TYPE_DOWNLOAD)) {
-				throwError("The string is not a valid rule for "+this.getClass().getName()); //$NON-NLS-1$
-			}
-		}
-		for (int i = 1; i < list.length; i++) {
-			String s = list[i];
-			/*
-			 * Split key from data.
-			 */
-			int p = s.indexOf(' ');
-			if (p == -1) {
-				logError("Invalid rule entry: "+s); //$NON-NLS-1$
-				continue;
-			}
-			String key = s.substring(0, p);
-			String value = s.substring(p + 1);
-			parseEntry(key, value);
-		}
-	}
-	
-	public DownloadRule(DownloadRule rule) {
-		this.overwritePolicy = rule.overwritePolicy;
-		this.asReadOnly = rule.asReadOnly;
-		this.asExecutable = rule.asExecutable;
-		this.preserveTimeStamp = rule.preserveTimeStamp;
-		if (rule.localDirectory != null) {
-			this.localDirectory = new String(rule.localDirectory);
-		} else {
-			this.localDirectory = null;
-		}
-		this.remoteFileList = new ArrayList(rule.remoteFileList);
-	}
-
-	private void throwError(String string) {
-		throw new RuntimeException(string);		
-	}
-
-	private void parseEntry(String key, String value) {
-		if (key.equalsIgnoreCase(SerializationKeys.KEY_LOCAL_PATH)) {
-			localDirectory = value;
-		} else if (key.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY)) {
-			if (value.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY_ALWAYS)) {
-				overwritePolicy = OverwritePolicies.ALWAYS;
-			} else if (value.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY_ASK)) {
-				overwritePolicy = OverwritePolicies.ASK;
-			} else if (value.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY_NEWER)) {
-				overwritePolicy = OverwritePolicies.NEWER;
-			} else if (value.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY_SKIP)) {
-				overwritePolicy = OverwritePolicies.SKIP;
-			} else {
-				logError("Unknown overwrite policy: "+value); //$NON-NLS-1$
-			}
-		} else if (key.equalsIgnoreCase(SerializationKeys.KEY_FLAGS)) {
-			String flags[] = value.split(" "); //$NON-NLS-1$
-			for (int i = 0; i < flags.length; i++) {
-				String flag = flags[i];
-				if (flag.equalsIgnoreCase(SerializationKeys.KEY_FLAGS_TIMESTAMP)) {
-					preserveTimeStamp = true;
-				} else {
-					logError("Unknown flag: "+flag); //$NON-NLS-1$
-				}
-			}
-		} else if (key.equalsIgnoreCase(SerializationKeys.KEY_REMOTE_PATH)) {
-			remoteFileList.add(value);
-		} else if (key.equalsIgnoreCase(SerializationKeys.KEY_PERMISSIONS)) {
-			String flags[] = value.split(" "); //$NON-NLS-1$
-			for (int i = 0; i < flags.length; i++) {
-				String flag = flags[i];
-				if (flag.equalsIgnoreCase(SerializationKeys.KEY_PERMISSIONS_EXECUTABLE)) {
-					asExecutable = true;
-				} else if (flag.equalsIgnoreCase(SerializationKeys.KEY_PERMISSIONS_READONLY)) {
-					asReadOnly = true;
-				} else {
-					logError("Unknown permission: "+flag); //$NON-NLS-1$
-				}
-			}			
-		} else {
-			logError("Unknown key: "+key); //$NON-NLS-1$
-		}
-	}
-
-	private void logError(String string) {
-		// TODO Auto-generated method stub
-	}
-
-	/*
-	 * The rule as a serialized string.
-	 */
-	public String toString() {
-		List l = new ArrayList();
-		if (localDirectory != null) {
-			l.add(SerializationKeys.KEY_LOCAL_PATH+" "+localDirectory.trim()); //$NON-NLS-1$
-		}
-		if (overwritePolicy == OverwritePolicies.ALWAYS) {
-			l.add(SerializationKeys.KEY_OVERWRITE_POLICY+" "+SerializationKeys.KEY_OVERWRITE_POLICY_ALWAYS);			 //$NON-NLS-1$
-		} else if (overwritePolicy == OverwritePolicies.ASK) {
-			l.add(SerializationKeys.KEY_OVERWRITE_POLICY+" "+SerializationKeys.KEY_OVERWRITE_POLICY_ASK);			 //$NON-NLS-1$
-		} else if (overwritePolicy == OverwritePolicies.NEWER) {
-			l.add(SerializationKeys.KEY_OVERWRITE_POLICY+" "+SerializationKeys.KEY_OVERWRITE_POLICY_NEWER);			 //$NON-NLS-1$
-		} else if (overwritePolicy == OverwritePolicies.SKIP) {
-			l.add(SerializationKeys.KEY_OVERWRITE_POLICY+" "+SerializationKeys.KEY_OVERWRITE_POLICY_SKIP);			 //$NON-NLS-1$
-		}
-		if (asExecutable || asReadOnly) {
-			String s = SerializationKeys.KEY_PERMISSIONS;
-			if (asExecutable) {
-				s += " " + SerializationKeys.KEY_PERMISSIONS_EXECUTABLE; //$NON-NLS-1$
-			}
-			if (asReadOnly) {
-				s += " " + SerializationKeys.KEY_PERMISSIONS_READONLY; //$NON-NLS-1$
-			}
-			l.add(s);
-		}
-		if (preserveTimeStamp) {
-			String s = SerializationKeys.KEY_FLAGS;
-			if (preserveTimeStamp) {
-				s += " " + SerializationKeys.KEY_FLAGS_TIMESTAMP; //$NON-NLS-1$
-			}
-			l.add(s);			
-		}
-		for (Iterator iter = remoteFileList.iterator(); iter.hasNext();) {
-			String remotePath = (String) iter.next();
-			if (remotePath == null) continue;
-			if (remotePath.trim().length() == 0) continue;
-			
-			l.add(SerializationKeys.KEY_REMOTE_PATH+" "+remotePath.trim());  //$NON-NLS-1$
-		}
-		String result = new String(SerializationKeys.TYPE_DOWNLOAD);
-		for (Iterator iter = l.iterator(); iter.hasNext();) {
-			String element = (String) iter.next();
-			result += "\n" + element; //$NON-NLS-1$
-		}
-		return result;
-	}
-
-	public boolean isAsExecutable() {
-		return asExecutable;
-	}
-
-	public void setAsExecutable(boolean asExecutable) {
-		this.asExecutable = asExecutable;
-	}
-
-	public boolean isAsReadOnly() {
-		return asReadOnly;
-	}
-
-	public void setAsReadOnly(boolean asReadOnly) {
-		this.asReadOnly = asReadOnly;
-	}
-
-	public int getOverwritePolicy() {
-		return overwritePolicy;
-	}
-
-	public void setOverwritePolicy(int overwritePolicy) {
-		this.overwritePolicy = overwritePolicy;
-	}
-
-	public boolean isPreserveTimeStamp() {
-		return preserveTimeStamp;
-	}
-
-	public void setPreserveTimeStamp(boolean preserveTimeStamp) {
-		this.preserveTimeStamp = preserveTimeStamp;
-	}
-
-	public String getLocalDirectory() {
-		if (localDirectory != null) {
-			return localDirectory.trim();
-		} else {
-			return null;
-		}
-	}
-	
-	public void setLocalDirectory(String localDirectory) {
-		if (localDirectory != null) {
-			this.localDirectory = localDirectory.trim();
-		} else {
-			this.localDirectory = null;
-		}
-	}
-	
-	public int getRemoteFileCount() {
-		return remoteFileList.size();
-	}
-	
-	public String [] getRemoteFilesAsStringArray() {
-		String result [] = new String [remoteFileList.size()];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = (String) remoteFileList.get(i);
-		}
-		return result;
-	}
-
-	public IPath [] getRemoteFilesAsPathArray() {
-		IPath result [] = new IPath [remoteFileList.size()];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = new Path((String) remoteFileList.get(i));
-		}
-		return result;
-	}
-
-	public File [] getRemoteFilesAsFileArray() {
-		File result [] = new File [remoteFileList.size()];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = new File((String) remoteFileList.get(i));
-		}
-		return result;
-	}
-	
-	public class RemoteFileIteratorAsString implements Iterator {
-		Iterator iteratorref = remoteFileList.iterator();
-		
-		public boolean hasNext() {
-			return iteratorref.hasNext();
-		}
-
-		public Object next() {
-			return iteratorref.next();
-		}
-
-		public void remove() {
-			iteratorref.remove();
-		}		
-	}
-
-	public class RemoteFileIteratorAsPath extends RemoteFileIteratorAsString {
-		public Object next() {
-			return new Path((String)iteratorref.next());
-		}
-	}
-
-	public Iterator remoteIteratorAsString() {
-		return new RemoteFileIteratorAsString();
-	}
-
-	public Iterator remoteIteratorAsPath() {
-		return new RemoteFileIteratorAsPath();
-	}
-
-	public void addRemoteFile(String string) {
-		if (string != null) {
-			remoteFileList.add(string);
-		}
-	}
-
-	public void addRemoteFile(IPath path) {
-		if (path != null) {
-			remoteFileList.add(path.toOSString());
-		}
-	}
-
-	public static void main(String[] args) {
-		DownloadRule r = new DownloadRule();
-		System.out.println(r);
-		r.setAsExecutable(true);
-		System.out.println(r);
-		r.setAsReadOnly(true);
-		System.out.println(r);
-		r.setLocalDirectory("/tmp/a"); //$NON-NLS-1$
-		System.out.println(r);
-		r.setOverwritePolicy(OverwritePolicies.ASK);
-		System.out.println(r);		
-	}
-
-	public void removeRemoteFile(String entry) {
-		for (Iterator iter = remoteFileList.iterator(); iter.hasNext();) {
-			String element = (String) iter.next();
-			if (element.equals(entry)) {
-				iter.remove();
-			}
-		}
-	}
-	
-	public void removeRemoteFile(IPath entry) {
-		removeRemoteFile(entry.toOSString());
-	}
-	
-	public void setRemoteFiles(String[] items) {
-		clearRemoteFiles();
-		for (int i = 0; i < items.length; i++) {
-			String string = items[i];
-			if (string != null) {
-				addRemoteFile(string.trim());
-			}
-		}
-	}
-	
-	public void setRemoteFiles(IPath[] items) {
-		clearRemoteFiles();
-		for (int i = 0; i < items.length; i++) {
-			IPath path = items[i];
-			if (path != null) {
-				addRemoteFile(path);
-			}
-		}
-	}
-	
-	public void clearRemoteFiles() {
-		remoteFileList.clear();
-	}
-
-	public boolean isActive() {
-		return true;
-	}
-
-	public boolean isDownloadRule() {
-		return true;
-	}
-
-	public boolean isUploadRule() {
-		return false;
-	}
-
-	public void validate() throws CoreException {
-		if (overwritePolicy == OverwritePolicies.UNKNOWN) {
-			RemoteLauncherPlugin.throwCoreException(Messages.DownloadRule_Validation_MissingOverwritePolicy, IRemoteLaunchErrors.INVALID_RULE);
-		}
-		if (localDirectory == null) {
-			RemoteLauncherPlugin.throwCoreException(Messages.DownloadRule_Validation_MissingRemoteDirectory, IRemoteLaunchErrors.INVALID_RULE);
-		}
-	}
-	
-	public String toLabel() {
-		String result = "DOWNLOAD "+Integer.toString(remoteFileList.size())+" item(s) back to "+localDirectory; //$NON-NLS-1$ //$NON-NLS-2$
-		return result;
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/ExecutionConfiguration.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/ExecutionConfiguration.java
deleted file mode 100755
index 4586c6b..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/ExecutionConfiguration.java
+++ /dev/null

@@ -1,265 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.data;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.cdt.core.model.ICProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.ptp.remotetools.environment.launcher.RemoteLauncherPlugin;
-import org.eclipse.ptp.remotetools.environment.launcher.core.IRemoteLaunchErrors;
-
-/**
- * Stores configuration how the remote launch it to be executed.
- * @author Daniel Felix Ferber
- */
-public class ExecutionConfiguration {
-
-	ICProject cProject = null; // required
-	File executable = null; // required
-	boolean doConnectStreams = true;
-	boolean doForwardX11 = false;
-	boolean doAllocateTerminal = true;
-	
-	IPath remoteDirectory = null; // required
-	File workingDirectory = null; // required
-	List arguments = new ArrayList();
-	
-	List environmentVariables = new ArrayList();
-	String beforeCommand = null; // defaults to nothing
-	String afterCommand = null; // defaults to nothing
-	boolean synchronizeAfter = false;
-	boolean synchronizeBefore = false;
-	boolean doCleanup = false;
-	
-	List synchronizationRules = new ArrayList();
-	
-	String label;
-	
-	public String getLabel() {
-		return label;
-	}
-	
-	public void setLabel(String label) {
-		this.label = label;
-	}
-
-	public boolean getDoCleanup() {
-		return doCleanup;
-	}
-
-	public void setDoCleanup(boolean doCleanup) {
-		this.doCleanup = doCleanup;
-	}
-
-	public String[] getArgumentsArray() {
-		String [] array = new String[arguments.size()];
-		arguments.toArray(array);
-		return array;
-	}
-	
-	public void addArgument(String argument) {
-		arguments.add(argument);
-	}
-
-	public void addArguments(String[] argumentsArray) {
-		for (int i = 0; i < argumentsArray.length; i++) {
-			String argument = argumentsArray[i];
-			addArgument(argument);
-		}
-	}
-
-	public boolean getDoConnectStreams() {
-		return doConnectStreams;
-	}
-
-	public void setDoConnectStream(boolean doConnect) {
-		this.doConnectStreams = doConnect;
-	}
-	
-	public boolean getDoForwardX11() {
-		return doForwardX11;
-	}
-
-	public void setDoForwardX11(boolean doForward) {
-		this.doForwardX11 = doForward;
-	}
-
-	public ICProject getProject() {
-		return cProject;
-	}
-
-	public void setProject(ICProject project) {
-		cProject = project;
-	}
-
-	public String[] getEnvironmentVariablesArray() {
-		String [] array = new String[environmentVariables.size()];
-		environmentVariables.toArray(array);
-		return array;
-	}
-
-	public void addEnvironmentVariable(String variable) {
-		environmentVariables.add(variable);
-	}
-
-	public void addEnvironmentVariables(String[] environmentArray) {
-		for (int i = 0; i < environmentArray.length; i++) {
-			String string = environmentArray[i];
-			addEnvironmentVariable(string);
-		}
-	}	
-
-	public File getExecutableFile() {
-		return executable;
-	}
-
-	public void setExecutable(File executable) {
-		this.executable = executable;
-	}
-
-	public IPath getRemoteDirectoryPath() {
-		return remoteDirectory;
-	}
-
-	static int counter = 0;
-	
-	public void setRemoteDirectory(IPath remoteDirectory) {
-		//this.remoteDirectory = remoteDirectory.append(Integer.toString(counter++));
-		this.remoteDirectory = remoteDirectory;
-	}
-
-	public File getWorkingDirectoryFile() {
-		return workingDirectory;
-	}
-	
-	public void setWorkingDirectory(File workingDirectory) {
-		this.workingDirectory = workingDirectory;
-	}
-
-	public IPath getRemoteExecutablePath() {
-		IPath localExecutable = new Path(executable.getPath());
-		IPath remoteExecutable = remoteDirectory.append(localExecutable.lastSegment());
-		return remoteExecutable;
-	}
-	
-	public String getRemoteExecutableName() {
-		return getRemoteExecutablePath().lastSegment();
-	}
-
-	public void setBeforeCommand(String beforeCommand) {
-		this.beforeCommand = beforeCommand;
-	}
-
-	public void setAfterCommand(String afterCommand) {
-		this.afterCommand = afterCommand;		
-	}
-
-	public void setDoSynchronizeAfter(boolean synchronizeAfter) {
-		this.synchronizeAfter = synchronizeAfter;
-	}
-	
-	public void setDoSynchronizeBefore(boolean synchronizeBefore) {
-		this.synchronizeBefore = synchronizeBefore;
-	}
-
-	public String getAfterCommand() {
-		return afterCommand;
-	}
-
-	public String getBeforeCommand() {
-		return beforeCommand;
-	}
-
-	public boolean getDoSynchronizeAfter() {
-		return synchronizeAfter;
-	}
-
-	public boolean getDoSynchronizeBefore() {
-		return synchronizeBefore;
-	}
-
-	public ISynchronizationRule[] getSynchronizationRulesArray() {
-		ISynchronizationRule[] array = (ISynchronizationRule[]) synchronizationRules.toArray(new ISynchronizationRule[synchronizationRules.size()]);
-		return array;
-	}
-
-	public void addSynchronizationRule(ISynchronizationRule rule) {
-		synchronizationRules.add(rule);
-	}
-
-	public void addSynchronizationRules(ISynchronizationRule []rules) {
-		for (int i = 0; i < rules.length; i++) {
-			ISynchronizationRule rule = rules[i];
-			addSynchronizationRule(rule);
-		}
-	}	
-	
-	public int countSynchronizationRules() {
-		return synchronizationRules.size();
-	}
-	
-	public int countUploadRules() {
-		int result = 0;
-		for (Iterator iter = synchronizationRules.iterator(); iter.hasNext();) {
-			ISynchronizationRule element = (ISynchronizationRule) iter.next();
-			if (element.isUploadRule()) {
-				result++;
-			}
-		}
-		return result;
-	}
-	
-	public int countDownloadRules() {
-		int result = 0;
-		for (Iterator iter = synchronizationRules.iterator(); iter.hasNext();) {
-			ISynchronizationRule element = (ISynchronizationRule) iter.next();
-			if (element.isDownloadRule()) {
-				result++;
-			}
-		}
-		return result;
-	}
-
-	public void setDoAllocateTerminal(boolean allocateTerminal) {
-		this.doAllocateTerminal = allocateTerminal;
-	}
-	
-	public boolean getDoAllocateTerminal() {
-		return doAllocateTerminal;
-	}
-	
-	/**
-	 * Validate the configuration and raise a {@link CoreException} if some attribute is missing
-	 * or invalid.
-	 */
-	public void validate() throws CoreException {
-		if (cProject == null) {
-			RemoteLauncherPlugin.throwCoreException(Messages.ExecutionConfiguration_Error_MissingProject, IRemoteLaunchErrors.INVALID_EXECUTION_CONFIGURATION);
-		}
-		if (executable == null) {
-			RemoteLauncherPlugin.throwCoreException(Messages.ExecutionConfiguration_Error_MissingExecutable, IRemoteLaunchErrors.INVALID_EXECUTION_CONFIGURATION);
-		}
-		if (remoteDirectory == null) {
-			RemoteLauncherPlugin.throwCoreException(Messages.ExecutionConfiguration_Error_MissingRemoteWorkingDirectory, IRemoteLaunchErrors.INVALID_EXECUTION_CONFIGURATION);
-		}
-		if (workingDirectory == null) {
-			RemoteLauncherPlugin.throwCoreException(Messages.ExecutionConfiguration_Error_MissingLocalRemoteDirectory, IRemoteLaunchErrors.INVALID_EXECUTION_CONFIGURATION);
-		}
-		
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/ExecutionResult.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/ExecutionResult.java
deleted file mode 100755
index fcafc05..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/ExecutionResult.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.data;
-
-/**
- * Stores information about how the remote launch finished execution.
- * @author Daniel Felix Ferber
- */
-public class ExecutionResult {
-	int exitValue = 0;
-	int status = UNDEFINED;
-	
-	// Execution result status for remote application
-	/** The execution of application has noy yet finished. The execution resulta has not meaning yest. */
-	public static final int UNDEFINED = 0;
-	/** The execution of application has finished succesfully with zero as exit value. */
-	public static final int SUCCESS = 1;
-	/** The execution of application has finished succesfully, but with nonzero exit value. */
-	public static final int SUCCESS_WITH_CODE = 2;
-	/** The execution of the application was cancelled because the the user terminated/killed the process. */
-	public static final int CANCELLED = 3;
-	/** The execution of the application was terminated by the remote operating system. */
-	public static final int EXCEPTION = 4;
-	/** The command used to launch the application was not accepted by the remote operating system. */
-	public static final int COMMAND_ERROR = 5;
-	/** The execution of application failed, but no information is available. */
-	public static final int UNKNOWN = 6;
-	/** The launcher failed due an internal error. */
-	public static final int ERROR = 7;
-	
-	public int getExitValue() {
-		return exitValue;
-	}
-
-	public void setExitValue(int exitValue) {
-		this.exitValue = exitValue;
-	}
-	
-	public int getStatus() {
-		return status;
-	}
-	
-	public void setStatus(int status) {
-		this.status = status;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/ISynchronizationRule.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/ISynchronizationRule.java
deleted file mode 100755
index 5fc502b..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/ISynchronizationRule.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.data;
-
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * Identifies a synchronizatuion rule for the launch job.
- * @author Daniel Ferber
- *
- */
-
-public interface ISynchronizationRule {
-	/**
-	 * A label to show the rule for debug.
-	 * @return The label
-	 * @deprecated
-	 */
-	public String toLabel();
-	
-	/**
-	 * Query if the rule is active and has all required information to be applied.
-	 * @return
-	 */
-	public boolean isActive();
-	
-	/**
-	 * Validate the rule and raise a {@link CoreException} if some attribute is missing
-	 * or not valid. The validation does not include check for existing files.
-	 */
-	public void validate() throws CoreException;
-	
-	/**
-	 * Queries if the tule can be used by launch job after the application finishes execution on the remote host.
-	 * @author Daniel Ferber
-	 *
-	 */
-	public boolean isDownloadRule();
-
-	/**
-	 * Queries if the rule can be used by launch job before the application starts execution on the remote host.
-	 * @author Daniel Ferber
-	 *
-	 */
-	public boolean isUploadRule();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/Messages.java
deleted file mode 100755
index f55a9a6..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/Messages.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.data;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remotetools.environment.launcher.data.messages"; //$NON-NLS-1$
-
-	public static String DownloadRule_Validation_MissingOverwritePolicy;
-
-	public static String DownloadRule_Validation_MissingRemoteDirectory;
-
-	public static String ExecutionConfiguration_Error_MissingExecutable;
-
-	public static String ExecutionConfiguration_Error_MissingLocalRemoteDirectory;
-
-	public static String ExecutionConfiguration_Error_MissingProject;
-
-	public static String ExecutionConfiguration_Error_MissingRemoteWorkingDirectory;
-
-	public static String UploadRule_Validate_MissingOverwritePolicy;
-
-	public static String UploadRule_Validate_MissingRemotedirectory;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/OverwritePolicies.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/OverwritePolicies.java
deleted file mode 100755
index cbeb08c..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/OverwritePolicies.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.data;
-
-public interface OverwritePolicies {
-	
-	public static final int UNKNOWN = 0;
-	public static final int SKIP = 1;
-	public static final int ALWAYS = 2;
-	public static final int NEWER = 3;
-	public static final int ASK = 4;
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/RuleFactory.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/RuleFactory.java
deleted file mode 100755
index a27778f..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/RuleFactory.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.data;
-
-
-public class RuleFactory {
-	
-	/**
-	 * Returns a new synchronization rule object for the serialized string.
-	 * @param string The serialized string
-	 * @return The rule or null if no rule is known for the string.
-	 */
-	public static ISynchronizationRule createRuleFromString(String string) {
-		String list[] = string.split("\n"); //$NON-NLS-1$
-		String first = list[0];
-		if (first.equalsIgnoreCase(SerializationKeys.TYPE_UPLOAD)) {
-			return new UploadRule(string);
-		} else if (first.equalsIgnoreCase(SerializationKeys.TYPE_DOWNLOAD)) {
-			return new DownloadRule(string);
-		} else {
-			return null;
-		}
-	}
-	
-	public static ISynchronizationRule duplicateRule(ISynchronizationRule rule) {
-		if (rule instanceof DownloadRule) {
-			DownloadRule downloadRule = (DownloadRule) rule;
-			return new DownloadRule(downloadRule);
-		} if (rule instanceof UploadRule) {
-			UploadRule uploadRule = (UploadRule) rule;
-			return new UploadRule(uploadRule);
-		} else {
-			return null;
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/SerializationKeys.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/SerializationKeys.java
deleted file mode 100755
index 9d8b239..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/SerializationKeys.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.data;
-
-
-interface SerializationKeys {
-	public static String TYPE_UPLOAD = "upload"; //$NON-NLS-1$
-	public static String TYPE_DOWNLOAD = "download"; //$NON-NLS-1$
-	
-	public static String KEY_REMOTE_PATH = "remote-path"; //$NON-NLS-1$
-
-	public static String KEY_OVERWRITE_POLICY = "overwrite-policy"; //$NON-NLS-1$
-
-	public static String KEY_OVERWRITE_POLICY_SKIP = "skip"; //$NON-NLS-1$
-
-	public static String KEY_OVERWRITE_POLICY_ALWAYS = "always"; //$NON-NLS-1$
-
-	public static String KEY_OVERWRITE_POLICY_NEWER = "newer"; //$NON-NLS-1$
-
-	public static String KEY_OVERWRITE_POLICY_ASK = "ask"; //$NON-NLS-1$
-
-	public static String KEY_PERMISSIONS = "permissions"; //$NON-NLS-1$
-
-	public static String KEY_PERMISSIONS_READONLY = "readonly"; //$NON-NLS-1$
-
-	public static String KEY_PERMISSIONS_EXECUTABLE = "executable"; //$NON-NLS-1$
-
-	public static String KEY_FLAGS = "flags"; //$NON-NLS-1$
-
-	public static String KEY_FLAGS_TIMESTAMP = "timestamp"; //$NON-NLS-1$
-
-	public static String KEY_FLAGS_DOWNLOAD_BACK = "download-back"; //$NON-NLS-1$
-
-	public static String KEY_FLAGS_DEFAULT_REMOTE_DIRECTORY = "default-remote-directory"; //$NON-NLS-1$
-
-	public static String KEY_LOCAL_PATH = "local-path"; //$NON-NLS-1$
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/UploadRule.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/UploadRule.java
deleted file mode 100755
index 17ecb2b..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/UploadRule.java
+++ /dev/null

@@ -1,472 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.data;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.ptp.remotetools.environment.launcher.RemoteLauncherPlugin;
-import org.eclipse.ptp.remotetools.environment.launcher.core.IRemoteLaunchErrors;
-
-/*
- * Represents an upload rule.
- * It describes how to copy a list of local files or local directories into a single remote directory.
- * A local file is copied into the remote directory.
- * A local directory has its content copied recursively into the remote directory.
- */
-public class UploadRule implements ISynchronizationRule {
-	private int overwritePolicy = OverwritePolicies.UNKNOWN;
-
-	private boolean asReadOnly = false;
-
-	private boolean asExecutable = false;
-
-	private boolean preserveTimeStamp = false;
-	
-	private boolean downloadBack = false;
-
-	private boolean defaultRemoteDirectory = false;
-
-	private String remoteDirectory = null;
-
-	/*
-	 * List of local paths, represented as strings.
-	 * They may be files or directories.
-	 */
-	private List localFileList = new ArrayList();
-
-	/*
-	 * Default constructor.
-	 */
-	public UploadRule() {
-
-	}
-
-	/*
-	 * Creates de rule from a serialized string.
-	 */
-	public UploadRule(String data) {
-		/*
-		 * Split the string into lines.
-		 */
-		String list[] = data.split("\n"); //$NON-NLS-1$
-		/*
-		 * Check if the first token is the proper identifier. If not, the string does not represent a rule that
-		 * can be parsed by this class.
-		 */
-		{
-			if (list.length < 1) {
-				throwError("The string is not a valid rule for "+this.getClass().getName()); //$NON-NLS-1$
-			}
-			String s = list[0];
-			if (! s.equalsIgnoreCase(SerializationKeys.TYPE_UPLOAD)) {
-				throwError("The string is not a valid rule for "+this.getClass().getName()); //$NON-NLS-1$
-			}
-		}
-		for (int i = 1; i < list.length; i++) {
-			String s = list[i];
-			/*
-			 * Split key from data.
-			 */
-			int p = s.indexOf(' ');
-			if (p == -1) {
-				logError("Invalid rule entry: "+s); //$NON-NLS-1$
-				continue;
-			}
-			String key = s.substring(0, p);
-			String value = s.substring(p + 1);
-			parseEntry(key, value);
-		}
-	}
-	
-	public UploadRule(UploadRule rule) {
-		this.overwritePolicy = rule.overwritePolicy;
-		this.asReadOnly = rule.asReadOnly;
-		this.asExecutable = rule.asExecutable;
-		this.preserveTimeStamp = rule.preserveTimeStamp;
-		this.downloadBack = rule.downloadBack;
-		this.defaultRemoteDirectory = rule.defaultRemoteDirectory;
-		if (rule.remoteDirectory != null) {
-			this.remoteDirectory = new String(rule.remoteDirectory);
-		} else {
-			this.remoteDirectory = null;
-		}
-		this.localFileList = new ArrayList(rule.localFileList);
-	}
-
-	private void throwError(String string) {
-		throw new RuntimeException(string);		
-	}
-
-	private void parseEntry(String key, String value) {
-		if (key.equalsIgnoreCase(SerializationKeys.KEY_REMOTE_PATH)) {
-			remoteDirectory = value;
-		} else if (key.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY)) {
-			if (value.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY_ALWAYS)) {
-				overwritePolicy = OverwritePolicies.ALWAYS;
-			} else if (value.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY_ASK)) {
-				overwritePolicy = OverwritePolicies.ASK;
-			} else if (value.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY_NEWER)) {
-				overwritePolicy = OverwritePolicies.NEWER;
-			} else if (value.equalsIgnoreCase(SerializationKeys.KEY_OVERWRITE_POLICY_SKIP)) {
-				overwritePolicy = OverwritePolicies.SKIP;
-			} else {
-				logError("Unknown overwrite policy: "+value); //$NON-NLS-1$
-			}
-		} else if (key.equalsIgnoreCase(SerializationKeys.KEY_FLAGS)) {
-			String flags[] = value.split(" "); //$NON-NLS-1$
-			for (int i = 0; i < flags.length; i++) {
-				String flag = flags[i];
-				if (flag.equalsIgnoreCase(SerializationKeys.KEY_FLAGS_DEFAULT_REMOTE_DIRECTORY)) {
-					defaultRemoteDirectory = true;
-				} else if (flag.equalsIgnoreCase(SerializationKeys.KEY_FLAGS_TIMESTAMP)) {
-					preserveTimeStamp = true;
-				} else if (flag.equalsIgnoreCase(SerializationKeys.KEY_FLAGS_DOWNLOAD_BACK)) {
-					downloadBack = true;
-				} else {
-					logError("Unknown flag: "+flag); //$NON-NLS-1$
-				}
-			}
-		} else if (key.equalsIgnoreCase(SerializationKeys.KEY_LOCAL_PATH)) {
-			localFileList.add(value);
-		} else if (key.equalsIgnoreCase(SerializationKeys.KEY_PERMISSIONS)) {
-			String flags[] = value.split(" "); //$NON-NLS-1$
-			for (int i = 0; i < flags.length; i++) {
-				String flag = flags[i];
-				if (flag.equalsIgnoreCase(SerializationKeys.KEY_PERMISSIONS_EXECUTABLE)) {
-					asExecutable = true;
-				} else if (flag.equalsIgnoreCase(SerializationKeys.KEY_PERMISSIONS_READONLY)) {
-					asReadOnly = true;
-				} else {
-					logError("Unknown permission: "+flag); //$NON-NLS-1$
-				}
-			}			
-		} else {
-			logError("Unknown key: "+key); //$NON-NLS-1$
-		}
-	}
-
-	private void logError(String string) {
-		// TODO Auto-generated method stub
-	}
-
-	/*
-	 * The rule as a serialized string.
-	 */
-	public String toString() {
-		List l = new ArrayList();
-		if (remoteDirectory != null) {
-			l.add(SerializationKeys.KEY_REMOTE_PATH+" "+remoteDirectory.trim()); //$NON-NLS-1$
-		}
-		if (overwritePolicy == OverwritePolicies.ALWAYS) {
-			l.add(SerializationKeys.KEY_OVERWRITE_POLICY+" "+SerializationKeys.KEY_OVERWRITE_POLICY_ALWAYS);			 //$NON-NLS-1$
-		} else if (overwritePolicy == OverwritePolicies.ASK) {
-			l.add(SerializationKeys.KEY_OVERWRITE_POLICY+" "+SerializationKeys.KEY_OVERWRITE_POLICY_ASK);			 //$NON-NLS-1$
-		} else if (overwritePolicy == OverwritePolicies.NEWER) {
-			l.add(SerializationKeys.KEY_OVERWRITE_POLICY+" "+SerializationKeys.KEY_OVERWRITE_POLICY_NEWER);			 //$NON-NLS-1$
-		} else if (overwritePolicy == OverwritePolicies.SKIP) {
-			l.add(SerializationKeys.KEY_OVERWRITE_POLICY+" "+SerializationKeys.KEY_OVERWRITE_POLICY_SKIP);			 //$NON-NLS-1$
-		}
-		if (asExecutable || asReadOnly) {
-			String s = SerializationKeys.KEY_PERMISSIONS;
-			if (asExecutable) {
-				s += " " + SerializationKeys.KEY_PERMISSIONS_EXECUTABLE; //$NON-NLS-1$
-			}
-			if (asReadOnly) {
-				s += " " + SerializationKeys.KEY_PERMISSIONS_READONLY; //$NON-NLS-1$
-			}
-			l.add(s);
-		}
-		if (preserveTimeStamp || defaultRemoteDirectory || downloadBack) {
-			String s = SerializationKeys.KEY_FLAGS;
-			if (defaultRemoteDirectory) {
-				s += " " + SerializationKeys.KEY_FLAGS_DEFAULT_REMOTE_DIRECTORY; //$NON-NLS-1$
-			}
-			if (preserveTimeStamp) {
-				s += " " + SerializationKeys.KEY_FLAGS_TIMESTAMP; //$NON-NLS-1$
-			}
-			if (downloadBack) {
-				s += " " + SerializationKeys.KEY_FLAGS_DOWNLOAD_BACK;				 //$NON-NLS-1$
-			}
-			l.add(s);			
-		}
-		for (Iterator iter = localFileList.iterator(); iter.hasNext();) {
-			String localpath = (String) iter.next();
-			if (localpath == null) continue;
-			if (localpath.trim().length() == 0) continue;
-			
-			l.add(SerializationKeys.KEY_LOCAL_PATH+" "+localpath.trim());  //$NON-NLS-1$
-		}
-		String result = new String(SerializationKeys.TYPE_UPLOAD);
-		for (Iterator iter = l.iterator(); iter.hasNext();) {
-			String element = (String) iter.next();
-			result += "\n" + element; //$NON-NLS-1$
-		}
-		return result;
-	}
-
-	public boolean isAsExecutable() {
-		return asExecutable;
-	}
-
-	public void setAsExecutable(boolean asExecutable) {
-		this.asExecutable = asExecutable;
-	}
-
-	public boolean isAsReadOnly() {
-		return asReadOnly;
-	}
-
-	public void setAsReadOnly(boolean asReadOnly) {
-		this.asReadOnly = asReadOnly;
-	}
-
-	public boolean isDefaultRemoteDirectory() {
-		return defaultRemoteDirectory;
-	}
-
-	public void setDefaultRemoteDirectory(boolean defaultRemoteDirectory) {
-		this.defaultRemoteDirectory = defaultRemoteDirectory;
-	}
-
-	public int getOverwritePolicy() {
-		return overwritePolicy;
-	}
-
-	public void setOverwritePolicy(int overwritePolicy) {
-		this.overwritePolicy = overwritePolicy;
-	}
-
-	public boolean isPreserveTimeStamp() {
-		return preserveTimeStamp;
-	}
-
-	public void setPreserveTimeStamp(boolean preserveTimeStamp) {
-		this.preserveTimeStamp = preserveTimeStamp;
-	}
-
-	public String getRemoteDirectory() {
-		if (remoteDirectory != null) {
-				return remoteDirectory.trim();
-		} else {
-			return null;
-		}
-	}
-	
-	public void setRemoteDirectory(String remoteDirectory) {
-		if (remoteDirectory != null) {
-			this.remoteDirectory = remoteDirectory.trim();
-		} else {
-			this.remoteDirectory = null;
-		}
-	}
-	
-	public void setDownloadBack(boolean downloadBack) {
-		this.downloadBack = downloadBack;
-	}
-	
-	public boolean isDownloadBack() {
-		return downloadBack;
-	}
-	
-	public int getRemoteFileCount() {
-		return localFileList.size();
-	}
-	
-	public String [] getLocalFilesAsStringArray() {
-		String result [] = new String [localFileList.size()];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = (String) localFileList.get(i);
-		}
-		return result;
-	}
-
-	public IPath [] getLocalFilesAsPathArray() {
-		IPath result [] = new IPath [localFileList.size()];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = new Path((String) localFileList.get(i));
-		}
-		return result;
-	}
-
-	public File [] getLocalFilesAsFileArray() {
-		File result [] = new File [localFileList.size()];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = new File((String) localFileList.get(i));
-		}
-		return result;
-	}
-	
-	public class LocalFileIteratorAsString implements Iterator {
-		Iterator iteratorref = localFileList.iterator();
-		
-		public boolean hasNext() {
-			return iteratorref.hasNext();
-		}
-
-		public Object next() {
-			return iteratorref.next();
-		}
-
-		public void remove() {
-			iteratorref.remove();
-		}		
-	}
-
-	public class LocalFileIteratorAsPath extends LocalFileIteratorAsString {
-		public Object next() {
-			return new Path((String)iteratorref.next());
-		}
-	}
-
-	public class LocalFileIteratorAsFile extends LocalFileIteratorAsString {
-		public Object next() {
-			return new File((String)iteratorref.next());
-		}
-	}
-
-	public Iterator localIteratorAsString() {
-		return new LocalFileIteratorAsString();
-	}
-
-	public Iterator localIteratorAsPath() {
-		return new LocalFileIteratorAsPath();
-	}
-
-	public Iterator localIteratorAsFile() {
-		return new LocalFileIteratorAsFile();
-	}
-
-	public void addLocalFile(String string) {
-		if (string != null) {
-			localFileList.add(string);
-		}
-	}
-
-	public void addLocalFile(IPath path) {
-		if (path != null) {
-			localFileList.add(path.toOSString());
-		}
-	}
-
-	public void addLocalFile(File file) {
-		if (file != null) {
-			localFileList.add(file.getPath());
-		}
-	}
-
-	public static void main(String[] args) {
-		UploadRule r = new UploadRule();
-		System.out.println(r);
-		r.setAsExecutable(true);
-		System.out.println(r);
-		r.setAsReadOnly(true);
-		System.out.println(r);
-		r.setRemoteDirectory("/tmp/a"); //$NON-NLS-1$
-		System.out.println(r);
-		r.setOverwritePolicy(OverwritePolicies.ASK);
-		System.out.println(r);
-		
-		String s = "upload\nremote-directory /tmp/a\npermissions executable readonly\nflags default-remote-directory"; //$NON-NLS-1$
-		r = new UploadRule(s);
-		System.out.println(r);
-		
-	}
-
-	public void removeLocalFile(String entry) {
-		for (Iterator iter = localFileList.iterator(); iter.hasNext();) {
-			String element = (String) iter.next();
-			if (element.equals(entry)) {
-				iter.remove();
-			}
-		}
-	}
-	
-	public void removeLocalFile(IPath entry) {
-		removeLocalFile(entry.toOSString());
-	}
-	
-	public void removeLocalFile(File entry) {
-		removeLocalFile(entry.getPath());
-	}
-
-	public void setLocalFiles(String[] items) {
-		clearLocalFiles();
-		for (int i = 0; i < items.length; i++) {
-			String string = items[i];
-			if (string != null) {
-				addLocalFile(string);
-			}
-		}
-	}
-	
-	public void setLocalFiles(IPath[] items) {
-		clearLocalFiles();
-		for (int i = 0; i < items.length; i++) {
-			IPath path = items[i];
-			if (path != null) {
-				addLocalFile(path);
-			}
-		}
-	}
-	
-	public void setLocalFiles(File[] items) {
-		clearLocalFiles();
-		for (int i = 0; i < items.length; i++) {
-			File file = items[i];
-			if (file != null) {
-				addLocalFile(file);
-			}
-		}
-	}
-
-	public void clearLocalFiles() {
-		localFileList.clear();
-	}
-
-	public boolean isActive() {
-		return true;
-	}
-
-	public boolean isDownloadRule() {
-		return false;
-	}
-
-	public boolean isUploadRule() {
-		return true;
-	}
-
-	public String toLabel() {
-		String result = "UPLOAD "+Integer.toString(localFileList.size())+" item(s) \nto "+remoteDirectory; //$NON-NLS-1$ //$NON-NLS-2$
-		return result;
-	}
-	
-	public void validate() throws CoreException {
-		if (overwritePolicy == OverwritePolicies.UNKNOWN) {
-			RemoteLauncherPlugin.throwCoreException(Messages.UploadRule_Validate_MissingOverwritePolicy, IRemoteLaunchErrors.INVALID_RULE);
-		}
-		if (defaultRemoteDirectory == false) {
-			if (remoteDirectory == null) {
-				RemoteLauncherPlugin.throwCoreException(Messages.UploadRule_Validate_MissingRemotedirectory, IRemoteLaunchErrors.INVALID_RULE);
-			}
-//			IPath remotePath = LinuxPath.fromString(remoteDirectory);
-//			if (! remotePath.isAbsolute()) {
-//				RemoteLauncherPlugin.throwCoreException("Remote directory must be an absolute path.", IRemoteLaunchErrors.INVALID_RULE);				
-//			}
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/messages.properties
deleted file mode 100755
index b692c92..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/data/messages.properties
+++ /dev/null

@@ -1,8 +0,0 @@
-ExecutionConfiguration_Error_MissingProject=No project specified for remote launch.
-ExecutionConfiguration_Error_MissingExecutable=No executable specified for remote launch.
-ExecutionConfiguration_Error_MissingRemoteWorkingDirectory=No remote working directory specified for remote launch.
-ExecutionConfiguration_Error_MissingLocalRemoteDirectory=No local working directory specified for remote launch.
-UploadRule_Validate_MissingOverwritePolicy=No overwrite policy specified for upload rule.
-UploadRule_Validate_MissingRemotedirectory=No remote directory specified for upload rule.
-DownloadRule_Validation_MissingOverwritePolicy=No overwrite policy specified for download rule.
-DownloadRule_Validation_MissingRemoteDirectory=No remote directory specified for download rule.

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/DownloadBackAction.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/DownloadBackAction.java
deleted file mode 100755
index 54b1d3b..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/DownloadBackAction.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 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 Implementation
- *     Roland Schulz, University of Tennessee
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal;
-
-import java.io.File;
-import java.io.PrintWriter;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.remotetools.core.IRemoteCopyTools;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.core.IRemoteFileTools;
-import org.eclipse.ptp.remotetools.core.IRemoteItem;
-import org.eclipse.ptp.remotetools.environment.launcher.core.LinuxPath;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ExecutionConfiguration;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-
-public class DownloadBackAction implements IRuleAction {
-	
-	private ILaunchProcessCallback process;
-	private DownloadBackRule rule;
-	private ExecutionConfiguration configuration;
-	private PrintWriter outputWriter;
-	private PrintWriter errorWriter;
-	private IRemoteExecutionManager manager;
-
-	public DownloadBackAction(ILaunchProcessCallback process, DownloadBackRule downloadBackRule) {
-		super();
-		this.process = process;
-		this.rule = downloadBackRule;
-		configuration = process.getConfiguration();
-		outputWriter = process.getOutputWriter();
-		errorWriter = process.getErrorWriter();	
-		manager = process.getExecutionManager();
-	}
-
-	public void run() throws CoreException, CancelException, RemoteConnectionException {
-		Assert.isNotNull(process);
-		Assert.isNotNull(rule);
-		Assert.isNotNull(configuration);
-		Assert.isNotNull(outputWriter);
-		Assert.isNotNull(errorWriter);
-		Assert.isNotNull(manager);
-		
-		/*
-		 * Process files in list.
-		 */
-		for (int i = 0; i < rule.count(); i++) {
-			File localFile = rule.getLocalFile(i);
-			IPath remotePath = rule.getRemoteFile(i);
-			downloadFile(localFile, remotePath, null);
-		}
-	}
-
-	private void downloadFile(File localFile, IPath remotePath, IProgressMonitor monitor) throws CoreException, CancelException, RemoteConnectionException {
-		String remotePathAsString = LinuxPath.toString(remotePath);
-		
-		IRemoteCopyTools copyTools = manager.getRemoteCopyTools();
-		IRemoteFileTools fileTools = manager.getRemoteFileTools();
-				
-		IRemoteItem remoteFile = null;
-		try {
-			remoteFile = fileTools.getFile(remotePathAsString, monitor);
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind(Messages.DownloadBackAction_FailedFetchRemoteProperties, e.getMessage()));
-			return;
-		}
-		
-		if (! remoteFile.exists()) {
-			errorWriter.println(NLS.bind(Messages.DownloadBackAction_FailedFiledDoesNotExist, remotePathAsString));
-			return;			
-		}
-		
-		/*
-		 * Test if file has been changed.
-		 */
-		long difference = remoteFile.getModificationTime() - localFile.lastModified();
-		if (difference < 1000 && remoteFile.getSize() == localFile.length()) {
-			outputWriter.println(NLS.bind(Messages.DownloadBackAction_NotifyFileNotChanged, remotePath));
-			return;					
-		}
-		
-		/*
-		 * Download file
-		 */
-		try {
-			outputWriter.println(NLS.bind(Messages.DownloadBackAction_NotifyDonwloadBack, remotePathAsString));
-			copyTools.downloadFileToFile(remotePathAsString, localFile);
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind(Messages.DownloadBackAction_FailedDownloadBack, e.getMessage()));
-			return;
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/DownloadBackRule.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/DownloadBackRule.java
deleted file mode 100755
index 931b8fd..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/DownloadBackRule.java
+++ /dev/null

@@ -1,68 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 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 Implementation
- *     Roland Schulz, University of Tennessee
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ISynchronizationRule;
-
-
-public class DownloadBackRule implements ISynchronizationRule {
-	List<IPath> remoteFiles = new ArrayList<IPath>();
-	List<File> localFiles = new ArrayList<File>();
-	
-	public DownloadBackRule() {
-	}
-	
-	public void add(File local, IPath remote) {
-		remoteFiles.add(remote);
-		localFiles.add(local);
-	}
-	
-	public File getLocalFile(int index) {
-		return (File) localFiles.get(index);
-	}
-		
-	public IPath getRemoteFile(int index) {
-		return (IPath) remoteFiles.get(index);
-	}
-	
-	public int count() {
-		return remoteFiles.size();
-	}
-
-	public boolean isActive() {
-		return remoteFiles.size() > 0;
-	}
-
-	public boolean isDownloadRule() {
-		return true; // by definition
-	}
-
-	public boolean isUploadRule() {
-		return false; // by definition
-	}
-
-	public String toLabel() {
-		return Messages.DownloadBackRule_0;
-	}
-
-	public void validate() throws CoreException {
-		// nothing to validate
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/DownloadRuleAction.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/DownloadRuleAction.java
deleted file mode 100755
index 1c264f0..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/DownloadRuleAction.java
+++ /dev/null

@@ -1,344 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal;
-
-import java.io.File;
-import java.io.PrintWriter;
-
-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.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.remotetools.core.IRemoteCopyTools;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.core.IRemoteFileEnumeration;
-import org.eclipse.ptp.remotetools.core.IRemoteFileTools;
-import org.eclipse.ptp.remotetools.core.IRemoteItem;
-import org.eclipse.ptp.remotetools.core.IRemoteStatusTools;
-import org.eclipse.ptp.remotetools.environment.launcher.core.LinuxPath;
-import org.eclipse.ptp.remotetools.environment.launcher.data.DownloadRule;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ExecutionConfiguration;
-import org.eclipse.ptp.remotetools.environment.launcher.data.OverwritePolicies;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-
-
-public class DownloadRuleAction implements IRuleAction {
-
-	private ILaunchProcessCallback process;
-	private DownloadRule rule;
-	private ExecutionConfiguration configuration;
-	private PrintWriter outputWriter;
-	private PrintWriter errorWriter;
-	private IRemoteExecutionManager manager;
-
-	public DownloadRuleAction(ILaunchProcessCallback process, DownloadRule rule) {
-		super();
-		this.process = process;
-		this.rule = rule;
-		configuration = process.getConfiguration();
-		outputWriter = process.getOutputWriter();
-		errorWriter = process.getErrorWriter();	
-		manager = process.getExecutionManager();
-	}
-
-	public void run() throws CoreException, CancelException, RemoteConnectionException {
-		Assert.isNotNull(process);
-		Assert.isNotNull(rule);
-		Assert.isNotNull(configuration);
-		Assert.isNotNull(outputWriter);
-		Assert.isNotNull(errorWriter);
-		Assert.isNotNull(manager);
-		
-		/*
-		 * If overwrite policy depends on time, then get remote clock skew.
-		 */
-		long clockSkew = 0;
-		if (rule.getOverwritePolicy() == OverwritePolicies.NEWER) {
-			IRemoteStatusTools statusTools = manager.getRemoteStatusTools();
-			long localTime;
-			long remoteTime;
-			try {
-				localTime = System.currentTimeMillis();
-				remoteTime = statusTools.getTime();
-				clockSkew = localTime -remoteTime;
-			} catch (RemoteOperationException e) {
-				errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedCalculateClockDifference, e.getMessage()));			
-				errorWriter.println(Messages.DownloadRuleAction_FailedCalculateClockDifference2);
-				clockSkew = 0;
-			}
-			if (clockSkew < -15000) {
-				errorWriter.println(Messages.DownloadRuleAction_WarningClockForward);
-			} else if (clockSkew > 15000) {
-				errorWriter.println(Messages.DownloadRuleAction_WarningClockBackward);				
-			}
-		}
-		
-		/*
-		 * Determine local path. Make it absolute. Create if necessary
-		 */
-		IPath localPath = new Path(rule.getLocalDirectory());
-		if (! localPath.isAbsolute()) {
-			IPath workspace = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-			localPath = workspace.append(localPath);
-		}
-		Assert.isTrue(localPath.isAbsolute(), "localPath.isAbsolute()"); //$NON-NLS-1$
-		File localDir = localPath.toFile();
-		if (! localDir.exists()) {
-			if (! localDir.mkdirs()) {
-				errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedCreateLocalDirectory, localPath.toString()));
-				return;								
-			}
-		} else if (! localDir.isDirectory()) {
-			errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedLocalDiretoryIsNotDirectory, localPath.toString()));
-			return;											
-		}
-		
-		/*
-		 * Determine list of remote paths. Make them absolute.
-		 */
-		IPath remotePaths [] = rule.getRemoteFilesAsPathArray();
-		IPath remoteWorkingPath = configuration.getRemoteDirectoryPath();
-		for (int i = 0; i < remotePaths.length; i++) {
-			IPath remotePath = remotePaths[i];
-			if (! remotePath.isAbsolute()) {
-				remotePath = remoteWorkingPath.append(remotePath);
-			}
-			remotePath = remotePath.removeTrailingSeparator();
-			Assert.isTrue(remotePath.isAbsolute(), "remotePath.isAbsolute()"); //$NON-NLS-1$
-			remotePaths[i] = remotePath;
-		}
-
-		/*
-		 * Process paths.
-		 */
-		IRemoteFileTools fileTools = manager.getRemoteFileTools();
-		for (int i = 0; i < remotePaths.length; i++) {
-			IPath remotePath = remotePaths[i];
-			String remotePathAsString = LinuxPath.toString(remotePath);
-			IRemoteItem item = null;
-			try {
-				item = fileTools.getItem(remotePathAsString);
-			} catch (RemoteOperationException e) {
-				errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedFetchAttributes, remotePathAsString));
-				continue;
-			}
-			
-			if (!item.exists()) {
-				errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedRemotePathDoesNotExit, remotePathAsString));
-				continue;
-			} else if (item.isDirectory()) {
-				downloadDirectory(item, localDir);
-			} else {
-				downloadFile(item, localDir);
-			}
-		}
-
-	}
-
-	private void downloadFile(IRemoteItem remoteFile, File localDir) throws RemoteConnectionException, CancelException {
-		Assert.isTrue(localDir.isAbsolute(), "localDir.isAbsolute()"); //$NON-NLS-1$
-		
-		IPath remoteFilePath = LinuxPath.fromString(remoteFile.getPath());
-		File localFile = new File(localDir, remoteFilePath.lastSegment());
-		outputWriter.println(NLS.bind(Messages.DownloadRuleAction_NotifyFileDownload1, remoteFile.getPath()));
-		outputWriter.println(NLS.bind(Messages.DownloadRuleAction_NotifyFileDownload2, localFile.getAbsolutePath()));
-
-		doFileDownload(remoteFile, localFile);	
-	}
-
-	private void downloadDirectory(IRemoteItem remoteDirectory, File localDir) throws RemoteConnectionException, CancelException {
-		Assert.isTrue(localDir.isAbsolute(), "localDir.isAbsolute()"); //$NON-NLS-1$
-
-		outputWriter.println(NLS.bind(Messages.DownloadRuleAction_NotifyDirectoryDownload1, remoteDirectory.getPath()));
-		outputWriter.println(NLS.bind(Messages.DownloadRuleAction_NotifyDirectoryDownload2, localDir.getAbsolutePath()));
-
-		IRemoteFileTools fileTools = manager.getRemoteFileTools();
-		
-		IRemoteFileEnumeration enumeration = null;
-		try {
-			enumeration = fileTools.createRecursiveFileEnumeration(remoteDirectory.getPath());
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedFetchRemoteAttributes, e.getMessage()));	
-			return;
-		}
-		
-		IPath remoteRootPath = LinuxPath.fromString(remoteDirectory.getPath());
-		IPath localRootPath = new Path(localDir.getAbsolutePath());
-		int remoteRootPathLength = remoteRootPath.segmentCount();
-		
-		while (enumeration.hasMoreElements()) {
-			while (enumeration.hasMoreExceptions()) {
-				errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedFetchRemoteAttributes, enumeration.nextException()));
-			}
-			/*
-			 * Calculate path relative to the remote root.
-			 * Generate path relative to the local root.
-			 */ 
-			IRemoteItem remoteItem = enumeration.nextElementAsItem();
-			IPath remotePath = LinuxPath.fromString(remoteItem.getPath());
-			IPath relativePath = remotePath.removeFirstSegments(remoteRootPathLength);
-			IPath localFilePath = localRootPath.append(relativePath);
-			File localFile = localFilePath.toFile();
-			if (remoteItem.isDirectory()) {
-				doDirectoryDownload(remoteItem, localFile);
-			} else {
-				doFileDownload(remoteItem, localFile);
-			}
-		}
-		while (enumeration.hasMoreExceptions()) {
-			errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedFetchRemoteAttributes, enumeration.nextException()));	
-		}
-	}
-	
-	private void doFileDownload(IRemoteItem remoteFile, File localFile) throws RemoteConnectionException, CancelException {
-		Assert.isTrue(localFile.isAbsolute(), "localFile.isAbsolute()"); //$NON-NLS-1$
-		
-		String remoteFileAsString = remoteFile.getPath();
-
-		IRemoteCopyTools copyTools = manager.getRemoteCopyTools();
-				
-		/*
-		 * Check if file exists and if file is newer, depending on overwrite policy.
-		 */
-		if (rule.getOverwritePolicy() == OverwritePolicies.ALWAYS) {
-			/*
-			 * File is always copied, no policy.
-			 */
-		} else {
-			/*
-			 * Policy needs to check remote file.
-			 */
-			if (rule.getOverwritePolicy() == OverwritePolicies.SKIP) {
-				if (localFile.exists()) {
-					outputWriter.println(NLS.bind(Messages.DownloadRuleAction_NotiftFileExistsLocally, localFile.getAbsolutePath()));
-					return;
-				}
-			} else if (rule.getOverwritePolicy() == OverwritePolicies.NEWER) {
-				long difference = remoteFile.getModificationTime() - localFile.lastModified();
-				if (difference < 1000) {
-					outputWriter.println(NLS.bind(Messages.DownloadRuleAction_NotiftNewerFileExistsLocally, localFile.getAbsolutePath()));
-					return;					
-				}
-			}
-		}  
-		
-		/*
-		 * Upload the file.
-		 */
-		try {
-			copyTools.downloadFileToFile(remoteFileAsString, localFile);
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedSetDownloadFile, e.getMessage()));
-			return;
-		}
-	
-		/*
-		 * Set file permissions. We need help of EFS, since the File class from
-		 * Java does not providel all information.
-		 */
-//		boolean read = remoteFile.isReadable();
-		boolean write = remoteFile.isWritable();
-		boolean execute = remoteFile.isExecutable();
-		
-		if (rule.isAsReadOnly()) {
-			write = false;
-		}
-		if (rule.isAsExecutable()) {
-			execute = true;
-		}
-		
-		IFileSystem localFileSystem = EFS.getLocalFileSystem();
-		IFileStore fileStore = localFileSystem.getStore(new Path(localFile.getPath()));
-		IFileInfo fileInfo = fileStore.fetchInfo();
-
-		fileInfo.setAttribute(EFS.ATTRIBUTE_EXECUTABLE, execute);
-		fileInfo.setAttribute(EFS.ATTRIBUTE_READ_ONLY, ! write);
-		
-		/*
-		 * Set date/time, if required
-		 */
-		if (rule.isPreserveTimeStamp()) {
-			long timestamp = remoteFile.getModificationTime();
-			fileInfo.setLastModified(timestamp);
-		}
-		
-		/*
-		 * Commit changes
-		 */
-		try {
-			fileStore.putInfo(fileInfo, EFS.SET_LAST_MODIFIED | EFS.SET_ATTRIBUTES, null);
-		} catch (CoreException e) {
-			errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedSetLocalFileAttributes, localFile.getAbsolutePath()));
-			return;
-		}
-	}
-
-	private void doDirectoryDownload(IRemoteItem remoteDir, File localDir) throws RemoteConnectionException, CancelException {
-		Assert.isTrue(localDir.isAbsolute(), "localFile.isAbsolute()"); //$NON-NLS-1$
-		
-		/*
-		 * Create local directory, if not already exists.
-		 */
-		if (! localDir.exists()) {
-			if (! localDir.mkdirs()) {
-				errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedCreateLocalDirectory, localDir.getAbsolutePath()));
-				return;
-			}
-		}
-	
-		/*
-		 * Set file permissions. We need help of EFS, since the File class from
-		 * Java does not providel all information.
-		 */
-//		boolean read = remoteDir.isReadable();
-		boolean write = remoteDir.isWritable();
-		boolean execute = true;
-		
-		if (rule.isAsReadOnly()) {
-			write = false;
-		}
-		
-		IFileSystem localFileSystem = EFS.getLocalFileSystem();
-		IFileStore fileStore = localFileSystem.getStore(new Path(localDir.getPath()));
-		IFileInfo fileInfo = fileStore.fetchInfo();
-
-		fileInfo.setAttribute(EFS.ATTRIBUTE_EXECUTABLE, execute);
-		fileInfo.setAttribute(EFS.ATTRIBUTE_READ_ONLY, ! write);
-		
-		/*
-		 * Set date/time, if required
-		 */
-		if (rule.isPreserveTimeStamp()) {
-			long timestamp = remoteDir.getModificationTime();
-			fileInfo.setLastModified(timestamp);
-		}
-		
-		/*
-		 * Commit changes
-		 */
-		try {
-			fileStore.putInfo(fileInfo, EFS.SET_LAST_MODIFIED | EFS.SET_ATTRIBUTES, null);
-		} catch (CoreException e) {
-			errorWriter.println(NLS.bind(Messages.DownloadRuleAction_FailedSetLocalDirectoryAttributes, localDir.getAbsolutePath()));
-			return;
-		}
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/ILaunchProcessCallback.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/ILaunchProcessCallback.java
deleted file mode 100755
index 4e80efb..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/ILaunchProcessCallback.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal;
-
-import java.io.PrintWriter;
-
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ExecutionConfiguration;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ISynchronizationRule;
-
-
-
-public interface ILaunchProcessCallback {
-	public PrintWriter getOutputWriter();
-	public PrintWriter getErrorWriter();
-	public ExecutionConfiguration getConfiguration();
-	public IRemoteExecutionManager getExecutionManager();
-	public void addSynchronizationRule(ISynchronizationRule downloadBackRule);
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/IRuleAction.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/IRuleAction.java
deleted file mode 100755
index 7b1c26f..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/IRuleAction.java
+++ /dev/null

@@ -1,21 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-
-
-public interface IRuleAction {
-	public void run() throws CoreException, CancelException, RemoteConnectionException;
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/LaunchObserverIterator.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/LaunchObserverIterator.java
deleted file mode 100755
index 82d6436..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/LaunchObserverIterator.java
+++ /dev/null

@@ -1,59 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.launcher.internal;
-
-import java.util.Enumeration;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.ptp.remotetools.environment.launcher.RemoteLauncherPlugin;
-import org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchObserver;
-import org.eclipse.ptp.utils.core.extensionpoints.ExtensionPointEnumeration;
-
-public class LaunchObserverIterator implements Enumeration {
-	
-	ExtensionPointEnumeration enumeration = new ExtensionPointEnumeration(RemoteLauncherPlugin.OBERVER_EXTENSION_ID);
-	IConfigurationElement current;
-	
-	public LaunchObserverIterator() {
-	}
-	
-	public String getID() {
-		if (current == null) return null;
-		return current.getAttribute("id"); //$NON-NLS-1$
-	}
-	
-	public String getName() {
-		if (current == null) return null;
-		return current.getAttribute("name");		 //$NON-NLS-1$
-	}
-	
-	public ILaunchObserver getInstance() {
-		if (current == null) return null;
-		try {
-			return (ILaunchObserver) current.createExecutableExtension("class"); //$NON-NLS-1$
-		} catch (CoreException e) {
-			return null;
-		}
-	}
-
-
-	public boolean hasMoreElements() {
-		return enumeration.hasMoreElements();
-	}
-
-
-	public Object nextElement() {
-		current = (IConfigurationElement) enumeration.nextElement();
-		return current;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/Messages.java
deleted file mode 100755
index df78e94..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/Messages.java
+++ /dev/null

@@ -1,136 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remotetools.environment.launcher.internal.messages"; //$NON-NLS-1$
-
-	public static String DownloadBackAction_FailedDownloadBack;
-	public static String DownloadBackAction_FailedFetchRemoteProperties;
-	public static String DownloadBackAction_FailedFiledDoesNotExist;
-	public static String DownloadBackAction_NotifyDonwloadBack;
-	public static String DownloadBackAction_NotifyFileNotChanged;
-
-	public static String DownloadBackRule_0;
-	public static String DownloadRuleAction_FailedCalculateClockDifference;
-	public static String DownloadRuleAction_FailedCalculateClockDifference2;
-	public static String DownloadRuleAction_FailedCreateLocalDirectory;
-	public static String DownloadRuleAction_FailedFetchAttributes;
-	public static String DownloadRuleAction_FailedFetchRemoteAttributes;
-	public static String DownloadRuleAction_FailedLocalDiretoryIsNotDirectory;
-	public static String DownloadRuleAction_FailedRemotePathDoesNotExit;
-	public static String DownloadRuleAction_FailedRemotePathNoDirectoryNorFile;
-	public static String DownloadRuleAction_FailedSetDownloadFile;
-	public static String DownloadRuleAction_FailedSetLocalDirectoryAttributes;
-	public static String DownloadRuleAction_FailedSetLocalFileAttributes;
-	public static String DownloadRuleAction_NotiftFileExistsLocally;
-	public static String DownloadRuleAction_NotiftNewerFileExistsLocally;
-	public static String DownloadRuleAction_NotifyDirectoryDownload1;
-	public static String DownloadRuleAction_NotifyDirectoryDownload2;
-	public static String DownloadRuleAction_NotifyFileDownload1;
-	public static String DownloadRuleAction_NotifyFileDownload2;
-	public static String DownloadRuleAction_WarningClockBackward;
-	public static String DownloadRuleAction_WarningClockForward;
-
-	public static String RemoteLaunchProcess_0;
-	public static String RemoteLaunchProcess_1;
-	public static String RemoteLaunchProcess_10;
-	public static String RemoteLaunchProcess_11;
-	public static String RemoteLaunchProcess_12;
-	public static String RemoteLaunchProcess_13;
-	public static String RemoteLaunchProcess_14;
-	public static String RemoteLaunchProcess_15;
-	public static String RemoteLaunchProcess_16;
-	public static String RemoteLaunchProcess_17;
-	public static String RemoteLaunchProcess_18;
-	public static String RemoteLaunchProcess_19;
-	public static String RemoteLaunchProcess_2;
-	public static String RemoteLaunchProcess_20;
-	public static String RemoteLaunchProcess_21;
-	public static String RemoteLaunchProcess_22;
-	public static String RemoteLaunchProcess_23;
-	public static String RemoteLaunchProcess_24;
-	public static String RemoteLaunchProcess_25;
-	public static String RemoteLaunchProcess_26;
-	public static String RemoteLaunchProcess_27;
-	public static String RemoteLaunchProcess_28;
-	public static String RemoteLaunchProcess_3;
-	public static String RemoteLaunchProcess_4;
-	public static String RemoteLaunchProcess_5;
-	public static String RemoteLaunchProcess_6;
-	public static String RemoteLaunchProcess_7;
-	public static String RemoteLaunchProcess_8;
-	public static String RemoteLaunchProcess_9;
-
-	public static String RemoteLaunchProcess_All_FailedConnection;
-	public static String RemoteLaunchProcess_Failed;
-	public static String RemoteLaunchProcess_FailedPermissions;
-	public static String RemoteLaunchProcess_PrepareWorkingDir_Failed;
-	public static String RemoteLaunchProcess_PrepareWorkingDir_FailedCreate;
-	public static String RemoteLaunchProcess_PrepareWorkingDir_FailedCreateHint;
-	public static String RemoteLaunchProcess_PrepareWorkingDir_FailedPermissions;
-	public static String RemoteLaunchProcess_PrepareWorkingDir_NotRequired;
-	public static String RemoteLaunchProcess_PrepareWorkingDir_Title;
-	public static String RemoteLaunchProcess_RequestToCancelLaunch;
-	public static String RemoteLaunchProcess_UploadApplication_CompletedUpload;
-	public static String RemoteLaunchProcess_UploadApplication_FailedUpload;
-	public static String RemoteLaunchProcess_UploadApplication_Title;
-	public static String RemoteLaunchProcess_UploadApplication_TitleNoUpload;
-	public static String RemoteLaunchProcess_UploadApplication_UploadMessage;
-	public static String RemoteLaunchProcess_UploadWorkingDirectory_FailedRule;
-	public static String RemoteLaunchProcess_UploadWorkingDirectory_IgnoreInactive;
-	public static String RemoteLaunchProcess_UploadWorkingDirectory_IgnoreInvalid;
-	public static String RemoteLaunchProcess_UploadWorkingDirectory_NoRules;
-	public static String RemoteLaunchProcess_UploadWorkingDirectory_Title;
-	public static String RemoteLaunchProcess_UploadWorkingDirectory_TitleUploadDisabled;
-	public static String RemoteLaunchProcess_DownloadWorkingDirectory_TitleDownloadDisabled;
-	public static String RemoteLaunchProcess_DownloadWorkingDirectory_Title;
-	public static String RemoteLaunchProcess_DownloadWorkingDirectory_IgnoreInactive;
-	public static String RemoteLaunchProcess_DownloadWorkingDirectory_IgnoreInvalid;
-	public static String RemoteLaunchProcess_DownloadWorkingDirectory_FailedRule;
-
-	public static String UploadRuleAction_0;
-	public static String UploadRuleAction_1;
-	public static String UploadRuleAction_10;
-	public static String UploadRuleAction_11;
-	public static String UploadRuleAction_12;
-	public static String UploadRuleAction_13;
-	public static String UploadRuleAction_14;
-	public static String UploadRuleAction_15;
-	public static String UploadRuleAction_16;
-	public static String UploadRuleAction_17;
-	public static String UploadRuleAction_18;
-	public static String UploadRuleAction_19;
-	public static String UploadRuleAction_2;
-	public static String UploadRuleAction_20;
-	public static String UploadRuleAction_21;
-	public static String UploadRuleAction_22;
-	public static String UploadRuleAction_23;
-	public static String UploadRuleAction_24;
-	public static String UploadRuleAction_3;
-	public static String UploadRuleAction_4;
-	public static String UploadRuleAction_5;
-	public static String UploadRuleAction_6;
-	public static String UploadRuleAction_7;
-	public static String UploadRuleAction_8;
-	public static String UploadRuleAction_9;
-	
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/RemoteLaunchProcess.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/RemoteLaunchProcess.java
deleted file mode 100755
index 47edac9..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/RemoteLaunchProcess.java
+++ /dev/null

@@ -1,784 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 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 Implementation
- *     Roland Schulz, University of Tennessee
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.IStreamListener;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.debug.core.model.IStreamMonitor;
-import org.eclipse.debug.core.model.IStreamsProxy;
-import org.eclipse.osgi.util.NLS;
-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.IRemotePathTools;
-import org.eclipse.ptp.remotetools.core.IRemoteScript;
-import org.eclipse.ptp.remotetools.core.IRemoteScriptExecution;
-import org.eclipse.ptp.remotetools.core.RemoteProcess;
-import org.eclipse.ptp.remotetools.environment.launcher.RemoteLauncherPlugin;
-import org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchIntegration;
-import org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchObserver;
-import org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchProcess;
-import org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchProgressListener;
-import org.eclipse.ptp.remotetools.environment.launcher.core.LinuxPath;
-import org.eclipse.ptp.remotetools.environment.launcher.core.NullLaunchIntegration;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ExecutionConfiguration;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ExecutionResult;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ISynchronizationRule;
-import org.eclipse.ptp.remotetools.environment.launcher.internal.integration.NullLaunchObserver;
-import org.eclipse.ptp.remotetools.environment.launcher.internal.process.TargetProcess;
-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;
-import org.eclipse.ptp.utils.core.ArgumentParser;
-import org.eclipse.ui.console.ConsolePlugin;
-import org.eclipse.ui.console.IConsole;
-import org.eclipse.ui.console.IConsoleManager;
-
-
-public class RemoteLaunchProcess implements ILaunchProcess, ILaunchProcessCallback {
-
-	int currentProgress = ILaunchProgressListener.UNDEFINED;
-
-	public ILaunchObserver observer = new NullLaunchObserver();
-	public ILaunchIntegration launchIntegration = new NullLaunchIntegration();
-	public ListenerList progressListeners = new ListenerList();
-	
-	OutputStream launchProcessOutputStream = null;
-	OutputStream launchProcessErrorStream = null;
-	
-	PrintWriter launchProcessOutputWriter = null;
-	PrintWriter launchProcessErrorWriter = null;
-	
-	ExecutionConfiguration configuration = null;
-	ExecutionResult executionResult = null;
-	List<ISynchronizationRule> extraSynchronizationRules = new ArrayList<ISynchronizationRule>();
-	
-	IProcess applicationProgress;
-	TargetProcess targetProcess;
-	ILaunch launch;
-	IRemoteExecutionManager manager;
-
-	String[] launchScript;
-
-	public RemoteLaunchProcess(ILaunch launch, ExecutionConfiguration configuration, ILaunchIntegration launchIntegration) {
-		super();
-		this.launch = launch;
-		this.configuration = configuration;
-		this.currentProgress = ILaunchProgressListener.WAIT;
-		this.executionResult = null;
-		if (launchIntegration == null) {
-			this.launchIntegration = new NullLaunchIntegration();
-		} else {
-			this.launchIntegration = launchIntegration;
-		}
-	}
-
-	public synchronized void markAsCanceled() {
-		launchProcessErrorWriter.println(Messages.RemoteLaunchProcess_RequestToCancelLaunch);
-		manager.cancel();
-	}
-	
-	public synchronized ILaunchObserver getObserver() {
-		return observer;
-	}
-
-	public synchronized ILaunchIntegration getLaunchIntegration() {
-		return launchIntegration;
-	}
-
-	protected synchronized void setCurrentProgress(int newProgress) {
-		this.currentProgress = newProgress;
-		for (Object listener : progressListeners.getListeners()) {
-			((ILaunchProgressListener)listener).notifyProgress(newProgress);
-		}
-	}
-	
-	protected synchronized void notifyInterrupt() {
-		for (Object listener : progressListeners.getListeners()) {
-			((ILaunchProgressListener)listener).notifyInterrupt();
-		}
-	}
-
-	public synchronized int getCurrentProgress() {
-		return currentProgress;
-	}
-
-	public synchronized ExecutionResult getFinalResult() {
-		return executionResult;
-	}
-	
-	public synchronized ExecutionConfiguration getConfiguration() {
-		return configuration;
-	}
-
-	protected void prepareWorkingDir() throws CoreException, CancelException {
-		/*
-		 * Only create the remote working directory if some step will require it.
-		 */
-		boolean doCreate = false;
-		if (configuration.getDoSynchronizeAfter() || configuration.getDoSynchronizeBefore()
-				|| configuration.getDoCleanup() || launchIntegration.getDoLaunchApplication()) {
-			doCreate = true;
-		}
-		if (! doCreate) {
-			launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_PrepareWorkingDir_NotRequired);
-			return;
-		}
-		
-		/*
-		 * Assure that the remote working directory exists. Create if necessary.
-		 */
-		IPath remotePath = configuration.getRemoteDirectoryPath();
-		String remoteDirectoryAsPath = LinuxPath.toString(remotePath);
-		launchProcessOutputWriter.println(NLS.bind(Messages.RemoteLaunchProcess_PrepareWorkingDir_Title, remoteDirectoryAsPath));
-		try {
-			IRemoteFileTools fileTools = manager.getRemoteFileTools();
-			fileTools.createDirectory(remoteDirectoryAsPath, null);
-		} catch (RemoteOperationException e) {
-			launchProcessErrorWriter.println(NLS.bind(Messages.RemoteLaunchProcess_PrepareWorkingDir_FailedCreate, e.getMessage()));
-			launchProcessErrorWriter.println(Messages.RemoteLaunchProcess_PrepareWorkingDir_FailedCreateHint);
-			abortWithError(Messages.RemoteLaunchProcess_PrepareWorkingDir_Failed, e);
-		} catch (RemoteConnectionException e) {
-			abortWithError(Messages.RemoteLaunchProcess_All_FailedConnection, e);
-		}
-		
-		/*
-		 * Assure permissions so that the user can enter and write the directory.
-		 */
-		try {
-			IRemoteFileTools fileTools = manager.getRemoteFileTools();
-			IRemoteItem remoteExecutable = fileTools.getDirectory(remoteDirectoryAsPath, null);
-			remoteExecutable.setExecutable(true);
-			remoteExecutable.setReadable(true);
-			remoteExecutable.setWriteable(true);
-			remoteExecutable.commitAttributes(null);
-		} catch (RemoteOperationException e) {
-			launchProcessErrorWriter.println(NLS.bind(Messages.RemoteLaunchProcess_PrepareWorkingDir_FailedPermissions, e.getMessage()));
-			abortWithError(Messages.RemoteLaunchProcess_PrepareWorkingDir_Failed, e);
-		} catch (RemoteConnectionException e) {
-			abortWithError(Messages.RemoteLaunchProcess_All_FailedConnection, e);
-		}
-	}
-
-	protected void uploadWorkingDirectory() throws CoreException, CancelException {
-		/*
-		 * Only run upload if this feature was enabled.
-		 */
-		if (! configuration.getDoSynchronizeBefore()) {
-			launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_UploadWorkingDirectory_TitleUploadDisabled);
-			return;
-		}
-
-		launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_UploadWorkingDirectory_Title);
-		
-		/*
-		 * Only run upload if rules are available.
-		 */
-		if (configuration.countUploadRules() <= 0) {
-			launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_UploadWorkingDirectory_NoRules);
-			return;
-		}
-		
-//		List rules_tmp = new ArrayList(Arrays.asList(configuration.getSynchronizationRulesArray()));
-//		rules_tmp.addAll(extraSynchronizationRules);
-//		ISynchronizationRule [] rules = (ISynchronizationRule[]) rules_tmp.toArray(new ISynchronizationRule[rules_tmp.size()]);
-		ISynchronizationRule [] rules = configuration.getSynchronizationRulesArray();
-		RuleActionFactory factory = new RuleActionFactory(this);
-		for (int i = 0; i < rules.length; i++) {
-			ISynchronizationRule rule = rules[i];
-			if (! rule.isUploadRule()) {
-				continue;
-			}
-			if (! rule.isActive()) {
-				String message = NLS.bind(Messages.RemoteLaunchProcess_UploadWorkingDirectory_IgnoreInactive, Integer.toString(i));
-				launchProcessOutputWriter.println(message);
-				continue;
-			}
-			try {
-				rule.validate();
-			} catch (CoreException e) {
-				String message = NLS.bind(Messages.RemoteLaunchProcess_UploadWorkingDirectory_IgnoreInvalid, new Object [] { Integer.toString(i), e.getMessage()});
-				launchProcessErrorWriter.println(message);
-				continue;
-			}
-			IRuleAction action = factory.getAction(rule);
-			try {
-				action.run();
-			} catch (CoreException e) {
-				String message = NLS.bind(Messages.RemoteLaunchProcess_UploadWorkingDirectory_FailedRule, new Object [] { Integer.toString(i), e.getMessage()});
-				launchProcessOutputWriter.println(message);
-			} catch (RemoteConnectionException e) {
-				abortWithError(Messages.RemoteLaunchProcess_All_FailedConnection, e);
-			}
-		}
-	}
-
-	protected void uploadApplication() throws CoreException, CancelException {
-		if (! launchIntegration.getDoLaunchApplication()) { 
-			launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_UploadApplication_TitleNoUpload);
-			return;
-		}
-		launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_UploadApplication_Title);
-		
-		// Shortcut to often used values
-		IPath remoteDirectoryPath = configuration.getRemoteDirectoryPath();
-		IPath remoteExecutablePath = configuration.getRemoteExecutablePath();
-		String remoteDirectory = LinuxPath.toString(remoteDirectoryPath);
-		String remoteExecutable = LinuxPath.toString(remoteExecutablePath);
-		File executableFile = configuration.getExecutableFile();
-		
-		try {
-			launchProcessOutputWriter.println(NLS.bind(Messages.RemoteLaunchProcess_UploadApplication_UploadMessage, new Object [] {executableFile.getCanonicalPath(), remoteExecutable}));
-		} catch (IOException e) {
-			// Ignore
-		}
-		
-		/*
-		 * Copy executable to working directory
-		 */
-		try {
-			manager.getRemoteCopyTools().uploadFileToDir(executableFile, remoteDirectory);
-			launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_UploadApplication_CompletedUpload);
-		} catch (RemoteOperationException e) {
-			launchProcessErrorWriter.println(NLS.bind(Messages.RemoteLaunchProcess_UploadApplication_FailedUpload, e.getMessage()));
-			abortWithError(Messages.RemoteLaunchProcess_Failed, e);
-		} catch (RemoteConnectionException e) {
-			abortWithError(Messages.RemoteLaunchProcess_All_FailedConnection, e);
-		}
-
-		/*
-		 * Assure executable permissions.
-		 */
-		try {
-			IRemoteFileTools fileTools = manager.getRemoteFileTools();
-			IRemoteItem remoteFile = fileTools.getFile(remoteExecutable, null);
-			remoteFile.setReadable(true);
-			remoteFile.setExecutable(true);
-			remoteFile.commitAttributes(null);
-		} catch (RemoteOperationException e) {
-			launchProcessErrorWriter.println(NLS.bind(Messages.RemoteLaunchProcess_FailedPermissions, e.getMessage()));
-			abortWithError(Messages.RemoteLaunchProcess_Failed, e);
-		} catch (RemoteConnectionException e) {
-			abortWithError(Messages.RemoteLaunchProcess_All_FailedConnection, e);
-		}
-	}
-
-	protected void downloadWorkingDirectory() throws CoreException, CancelException {
-		/*
-		 * Only run download if this feature was enabled.
-		 */
-		if (! configuration.getDoSynchronizeAfter() && extraSynchronizationRules.size() == 0) {
-			launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_DownloadWorkingDirectory_TitleDownloadDisabled);
-			return;
-		}
-
-		launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_DownloadWorkingDirectory_Title);
-		
-		/*
-		 * Only run download if rules are available.
-		 */
-		if (configuration.countDownloadRules() <= 0 && extraSynchronizationRules.size() == 0) {
-			launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_UploadWorkingDirectory_NoRules);
-			return;
-		}
-		
-		List rules_tmp = new ArrayList(Arrays.asList(configuration.getSynchronizationRulesArray()));
-		rules_tmp.addAll(extraSynchronizationRules);
-		ISynchronizationRule [] rules = (ISynchronizationRule[]) rules_tmp.toArray(new ISynchronizationRule[rules_tmp.size()]);
-		RuleActionFactory factory = new RuleActionFactory(this);
-		for (int i = 0; i < rules.length; i++) {
-			ISynchronizationRule rule = rules[i];
-			if (! rule.isDownloadRule()) {
-				continue;
-			}
-			if (! rule.isActive()) {
-				String message = NLS.bind(Messages.RemoteLaunchProcess_UploadWorkingDirectory_IgnoreInactive, Integer.toString(i));
-				launchProcessOutputWriter.println(message);
-				continue;
-			}
-			try {
-				rule.validate();
-			} catch (CoreException e) {
-				String message = NLS.bind(Messages.RemoteLaunchProcess_DownloadWorkingDirectory_IgnoreInvalid, new Object [] { Integer.toString(i), e.getMessage()});
-				launchProcessErrorWriter.println(message);
-				continue;
-			}
-			IRuleAction action = factory.getAction(rule);
-			try {
-				action.run();
-			} catch (CoreException e) {
-				String message = NLS.bind(Messages.RemoteLaunchProcess_DownloadWorkingDirectory_FailedRule, new Object [] { Integer.toString(i), e.getMessage()});
-				launchProcessOutputWriter.println(message);
-			} catch (RemoteConnectionException e) {
-				abortWithError(Messages.RemoteLaunchProcess_All_FailedConnection, e);
-			}
-		}
-	}
-
-	protected void prepareApplication() throws CoreException, CancelException {
-		if (! launchIntegration.getDoLaunchApplication()) return;
-
-		try {
-			String command = configuration.getBeforeCommand();
-			if (command == null) {
-				launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_0);
-				return;
-			}
-			command = command.trim();
-			if (command.length() == 0) {
-				launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_0);
-				return;
-			}
-			
-			launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_1);
-			launchProcessOutputWriter.println("   " + command); //$NON-NLS-1$
-			
-			IRemoteExecutionTools ret = manager.getExecutionTools();
-			IRemoteScript script = ret.createScript();
-			String[] environmentVariables = configuration.getEnvironmentVariablesArray();
-			for (int i = 0; i < environmentVariables.length; i++) {
-				script.addEnvironment(environmentVariables[i]);
-			}
-						
-			/*
-			 * Change the current directory from home to the actual working directory.
-			 */
-			command = "cd " + configuration.getRemoteDirectoryPath() + "\n" + command + "\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-			script.setScript(command.split("\n")); //$NON-NLS-1$
-			
-			IRemoteScriptExecution execution = ret.executeScript(script);
-			execution.waitForEndOfExecution();
-			if (execution.getReturnCode() == 0) {
-				launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_2);
-			} else {
-				launchProcessErrorWriter.println(Messages.RemoteLaunchProcess_3 + Integer.toString(execution.getReturnCode()));
-			}
-			execution.close();			
-		} catch (RemoteExecutionException e) {
-			launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_4 + e.getErrorMessage());
-		} catch (RemoteConnectionException e) {
-			abortWithError(Messages.RemoteLaunchProcess_5, e);
-		}		
-	}
-
-	protected void finalizeApplication() throws CoreException, CancelException {
-		if (! launchIntegration.getDoLaunchApplication()) return;
-
-		try {
-			String command = configuration.getAfterCommand();
-			if (command == null) {
-				launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_6);
-				return;			
-			}
-			command = command.trim();
-			if (command.length() == 0) {
-				launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_6);
-				return;
-			}
-			
-			launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_7);
-			launchProcessOutputWriter.println("   " + command); //$NON-NLS-1$
-			
-			IRemoteExecutionTools ret = manager.getExecutionTools();
-			IRemoteScript script = ret.createScript();
-			String[] environmentVariables = configuration.getEnvironmentVariablesArray();
-			for (int i = 0; i < environmentVariables.length; i++) {
-				script.addEnvironment(environmentVariables[i]);
-			}
-			
-			/*
-			 * Change the current directory from home to the actual working directory.
-			 */
-			command = "cd " + configuration.getRemoteDirectoryPath() + "\n" + command + "\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			
-			script.setScript(command.split("\n")); //$NON-NLS-1$
-			
-			IRemoteScriptExecution execution = ret.executeScript(script);
-			execution.waitForEndOfExecution();
-			if (execution.getReturnCode() == 0) {
-				launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_2);
-			} else {
-				launchProcessErrorWriter.println(Messages.RemoteLaunchProcess_3 + Integer.toString(execution.getReturnCode()));
-			}
-			execution.close();			
-		} catch (RemoteExecutionException e) {
-			launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_4 + e.getErrorMessage());
-		} catch (RemoteConnectionException e) {
-			abortWithError(Messages.RemoteLaunchProcess_8, e);
-		}		
-	}
-	
-	protected void runApplication() throws CoreException, CancelException {
-		if (! launchIntegration.getDoLaunchApplication()) {
-			launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_9);
-			return;
-		}
-		
-		IRemoteExecutionTools iret = null;
-		IRemoteScript script = null;
-		try {
-			iret = manager.getExecutionTools();
-			script = iret.createScript();
-		} catch (RemoteConnectionException e) {
-			abortWithError(Messages.RemoteLaunchProcess_8, e);
-		}
-		
-		String[] environmentVariables = configuration.getEnvironmentVariablesArray();
-		for (int i = 0; i < environmentVariables.length; i++) {
-			script.addEnvironment(environmentVariables[i]);
-		}
-		script.setForwardX11(configuration.getDoForwardX11());
-
-		ArrayList commandsList = new ArrayList(Arrays.asList(launchScript));
-		String remoteWorkingDirectory = LinuxPath.toString(configuration.getRemoteDirectoryPath());
-		IRemotePathTools pathTools = manager.getRemotePathTools();
-		commandsList.add(0, "cd " + pathTools.quote(remoteWorkingDirectory, true)); //$NON-NLS-1$
-		if (configuration.getDoAllocateTerminal()) {
-			// If terminal is allocated, then turn off echo, since Eclipse console already
-			// echo user input.
-			commandsList.add(0, "stty -echo"); //$NON-NLS-1$
-		}
-		String commands[] = new String[commandsList.size()];
-		commands = (String[]) commandsList.toArray(commands);
-		script.setScript(commands);
-		script.setFetchProcessErrorStream(true);
-		script.setFetchProcessInputStream(true);
-		script.setFetchProcessOutputStream(true);
-		script.setAllocateTerminal(configuration.getDoAllocateTerminal());
-		
-		RemoteProcess remoteProcess = null;
-		executionResult = new ExecutionResult();
-		try {
-			launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_10);
-			
-			launchIntegration.prepareLaunch();
-			remoteProcess = manager.getExecutionTools().executeProcess(script);
-			applicationProgress = DebugPlugin.newProcess(launch, remoteProcess, Messages.RemoteLaunchProcess_11);
-			IStreamsProxy proxy = applicationProgress.getStreamsProxy();
-			if (proxy != null) {
-				/*
-				 * The proxy exists only when a console was created for the process.
-				 */
-				IStreamListener listener = new IStreamListener() {
-					public void streamAppended(String text, IStreamMonitor monitor) {
-						observer.receiveOutput(text);
-					}
-				};
-				applicationProgress.getStreamsProxy().getOutputStreamMonitor().addListener(listener );
-			}
-			launchIntegration.finalizeLaunch();
-			showProcessConsole();
-			remoteProcess.waitFor();
-			
-			IRemoteScriptExecution execution = remoteProcess.getRemoteExecution();
-			executionResult = new ExecutionResult();
-			executionResult.setExitValue(execution.getReturnCode());
-			
-			if (execution.wasCanceled()) {
-				launchProcessErrorWriter.println(Messages.RemoteLaunchProcess_12);
-				executionResult.setStatus(ExecutionResult.CANCELLED);
-			} else if (execution.wasOK()) {
-				if (execution.getReturnCode() > 0) {
-					launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_13 + Integer.toString(executionResult.getExitValue()));
-					executionResult.setStatus(ExecutionResult.SUCCESS_WITH_CODE);
-				} else {
-					launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_14);
-					executionResult.setStatus(ExecutionResult.SUCCESS);
-				}
-			} else if (execution.wasException()) {
-				launchProcessErrorWriter.println(Messages.RemoteLaunchProcess_15 + execution.getFinishStatusText(execution.getFinishStatus()));
-				executionResult.setStatus(ExecutionResult.EXCEPTION);				
-			} else if (execution.wasCommandError()) {
-				launchProcessErrorWriter.println(Messages.RemoteLaunchProcess_16 + execution.getFinishStatusText(execution.getFinishStatus()));
-				executionResult.setStatus(ExecutionResult.COMMAND_ERROR);								
-			} else {
-				launchProcessErrorWriter.println(Messages.RemoteLaunchProcess_17);
-				executionResult.setStatus(ExecutionResult.UNKNOWN);
-			}
-		} catch (CoreException e) {
-			launchProcessErrorWriter.println(Messages.RemoteLaunchProcess_18 + e.getMessage());
-			IStatus status = e.getStatus();
-			if (status.isMultiStatus()) {
-				launchProcessErrorWriter.println("     " + status.getException().getMessage()); //$NON-NLS-1$
-			}
-			executionResult.setStatus(ExecutionResult.ERROR);
-			throw e;
-		} catch (RemoteConnectionException e) {
-			executionResult.setStatus(ExecutionResult.ERROR);
-			abortWithError(Messages.RemoteLaunchProcess_19, e);
-		} catch (RemoteExecutionException e) {
-			executionResult.setStatus(ExecutionResult.ERROR);
-			launchProcessErrorWriter.println(Messages.RemoteLaunchProcess_20 + e.getErrorMessage());
-		} catch (InterruptedException e) {
-			executionResult.setStatus(ExecutionResult.ERROR);
-			// TODO Auto-generated catch block
-		} finally {
-			remoteProcess.destroy();
-		}
-	}
-
-	protected void cleanUp() throws CoreException, CancelException {
-		if (! configuration.getDoCleanup()) {
-			launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_21);
-			return;
-		}
-
-		IPath remotePath = configuration.getRemoteDirectoryPath();
-		String remoteDirectory = LinuxPath.toString(remotePath);
-		try {
-			launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_22 + remoteDirectory);
-			IRemoteFileTools irft = manager.getRemoteFileTools();
-			irft.removeFile(remoteDirectory, null);
-			launchProcessOutputWriter.println(Messages.RemoteLaunchProcess_23);
-		} catch (RemoteOperationException e) {
-			launchProcessErrorWriter.println(Messages.RemoteLaunchProcess_24 + e.getMessage());
-			abortWithError(Messages.RemoteLaunchProcess_25, e);
-		} catch (RemoteConnectionException e) {
-			abortWithError(Messages.RemoteLaunchProcess_26, e);
-		}
-	}
-
-	public static String createCommandLine(String remoteExecutableName, String[] argumentsArray) {
-		ArgumentParser parser = new ArgumentParser(remoteExecutableName, argumentsArray);
-		return parser.getCommandLine(true);
-	}
-
-	public void run(IRemoteExecutionManager manager) {
-		this.manager = manager;
-		setCurrentProgress(ILaunchProgressListener.WAIT);
-		
-		/*
-		 * Create a job that represents the entire launch.
-		 */
-		targetProcess = new TargetProcess(launch, this);
-		addProgressListener(targetProcess);
-		launchProcessOutputWriter = new PrintWriter(targetProcess.getOutputStream(), true);
-		launchProcessErrorWriter = new PrintWriter(targetProcess.getErrorStream(), true);
-		targetProcess.start();
-
-		observer.setExecutionManager(manager);
-		launchIntegration.setExecutionManager(manager);
-
-		try {
-			observer.start();			
-			launchIntegration.start();
-			
-			String remexecpath = LinuxPath.toString(
-					configuration.getRemoteExecutablePath());
-			launchScript = launchIntegration.createLaunchScript(remexecpath, configuration.getArgumentsArray());
-			
-			setCurrentProgress(ILaunchProgressListener.PREPARE_WORKING_DIR1);
-			prepareWorkingDir();
-			launchIntegration.prepareUploadWorkingDir();
-
-			setCurrentProgress(ILaunchProgressListener.UPLOAD_WORKING_DIR);
-			uploadWorkingDirectory();
-
-			setCurrentProgress(ILaunchProgressListener.PREPARE_WORKING_DIR2);
-			launchIntegration.finalizeWorkingDir();
-
-			setCurrentProgress(ILaunchProgressListener.UPLOAD_APPLICATION);
-			uploadApplication();
-
-			setCurrentProgress(ILaunchProgressListener.PREPARE_APPLICATION);
-			prepareApplication();
-			launchIntegration.prepareApplication();
-			observer.prepareApplication();
-
-			setCurrentProgress(ILaunchProgressListener.RUNNING);
-			runApplication();
-			
-			setCurrentProgress(ILaunchProgressListener.FINALIZE_APPLICATION);
-			observer.finalizeApplication();
-			launchIntegration.finalizeApplication();
-			finalizeApplication();
-			
-			setCurrentProgress(ILaunchProgressListener.DOWNLOAD_WORKING_DIR);
-			downloadWorkingDirectory();
-			
-			setCurrentProgress(ILaunchProgressListener.FINALIZE_WORKING_DIR2);
-			launchIntegration.finalizeWorkingDir();
-			
-			setCurrentProgress(ILaunchProgressListener.CLEANUP);
-			cleanUp();
-
-			setCurrentProgress(ILaunchProgressListener.FINALIZE_CLEANUP);
-			launchIntegration.finalizeCleanup();
-			
-			setCurrentProgress(ILaunchProgressListener.FINISHED);
-			observer.finish();
-			launchIntegration.finish();
-
-			if (executionResult.getStatus() == ExecutionResult.SUCCESS) {
-				showProcessConsole();
-			} else {
-				showLaunchConsole();
-			}
-			
-		} catch (CancelException e) {
-			if (executionResult == null) {
-				executionResult = new ExecutionResult();
-				executionResult.setStatus(ExecutionResult.CANCELLED);
-			}
-			forcedCleanUp(manager);
-//			notifyInterrupt();
-		} catch (CoreException e) {
-			if (executionResult == null) {
-				executionResult = new ExecutionResult();
-				executionResult.setStatus(ExecutionResult.ERROR);
-			}
-			forcedCleanUp(manager);
-			launchProcessErrorWriter.println();
-			launchProcessErrorWriter.println(Messages.RemoteLaunchProcess_27);
-			launchProcessErrorWriter.println(Messages.RemoteLaunchProcess_28 + e.getMessage());
-			launchProcessErrorWriter.println();
-			notifyInterrupt();
-		} finally {
-			setCurrentProgress(ILaunchProgressListener.FINISHED);
-			observer.cleanup();
-			launchIntegration.cleanup();
-		}
-	}
-
-	private void forcedCleanUp(IRemoteExecutionManager manager) {
-		if (getCurrentProgress() > ILaunchProgressListener.PREPARE_APPLICATION) {
-			setCurrentProgress(ILaunchProgressListener.FINALIZE_APPLICATION);
-			try {
-				launchIntegration.finalizeApplication();
-			} catch (CancelException e) {
-			} catch (CoreException e) {
-			}
-		}
-		
-		setCurrentProgress(ILaunchProgressListener.FINALIZE_WORKING_DIR2);
-		try {
-			launchIntegration.finalizeCleanup();
-		} catch (CoreException e1) {
-		} catch (CancelException e1) {
-		}
-		
-		setCurrentProgress(ILaunchProgressListener.CLEANUP);
-		try {
-			cleanUp();
-		} catch (CancelException e) {
-		} catch (CoreException e) {
-		}
-
-		setCurrentProgress(ILaunchProgressListener.FINALIZE_CLEANUP);
-		try {
-			launchIntegration.finalizeCleanup();
-		} catch (CoreException e) {
-		} catch (CancelException e) {
-		}
-	}
-
-	protected void abortWithError(String message, Exception e) throws CoreException {
-		Status status = new Status(IStatus.ERROR, RemoteLauncherPlugin.getUniqueIdentifier(), 0, message, e);
-		throw new CoreException(status);
-	}
-	
-	public synchronized void addProgressListener(ILaunchProgressListener progressListener) {
-		progressListeners.add(progressListener);
-	}
-
-	public synchronized void removeProgressListener(ILaunchProgressListener progressListener) {
-		progressListeners.remove(progressListener);
-	}
-
-	public void setLaunchObserver(ILaunchObserver launchObserver) {
-		if (launchObserver == null) {
-			this.observer = new NullLaunchObserver();
-		} else {
-			this.observer = launchObserver;
-		}
-	}
-
-	public IRemoteExecutionManager getExecutionManager() {
-		return manager;
-	}
-
-	public ILaunch getLaunch() {
-		return launch;
-	}
-
-	public ILaunchConfiguration getLaunchConfiguration() {
-		return launch.getLaunchConfiguration();
-	}
-
-	public void showProcessConsole() {
-		if (applicationProgress == null) {
-			return;
-		}
-		IConsoleManager consoleManager = ConsolePlugin.getDefault().getConsoleManager();
-		IConsole[] consoles = consoleManager.getConsoles();
-		for (int i = 0; i < consoles.length; i++) {
-			IConsole console = consoles[i];
-			if (console instanceof org.eclipse.debug.ui.console.IConsole) {
-				org.eclipse.debug.ui.console.IConsole processConsole = (org.eclipse.debug.ui.console.IConsole) console;
-				IProcess process = processConsole.getProcess();
-				if (process == applicationProgress) {
-					consoleManager.showConsoleView(console);
-				}
-			}
-		}
-	}
-	
-	public void showLaunchConsole() {
-		if (applicationProgress == null) {
-			return;
-		}
-		IConsoleManager consoleManager = ConsolePlugin.getDefault().getConsoleManager();
-		IConsole[] consoles = consoleManager.getConsoles();
-		for (int i = 0; i < consoles.length; i++) {
-			IConsole console = consoles[i];
-			if (console instanceof org.eclipse.debug.ui.console.IConsole) {
-				org.eclipse.debug.ui.console.IConsole processConsole = (org.eclipse.debug.ui.console.IConsole) console;
-				IProcess process = processConsole.getProcess();
-				if (process == targetProcess) {
-					consoleManager.showConsoleView(console);
-				}
-			}
-		}
-	}
-
-	public PrintWriter getErrorWriter() {
-		return launchProcessErrorWriter;
-	}
-
-	public PrintWriter getOutputWriter() {
-		return launchProcessOutputWriter;
-	}
-
-	public void addSynchronizationRule(ISynchronizationRule rule) {
-		extraSynchronizationRules.add(rule);
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/RuleActionFactory.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/RuleActionFactory.java
deleted file mode 100755
index 03360fb..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/RuleActionFactory.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.ptp.remotetools.environment.launcher.data.DownloadRule;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ISynchronizationRule;
-import org.eclipse.ptp.remotetools.environment.launcher.data.UploadRule;
-
-
-public class RuleActionFactory {
-	
-	private ILaunchProcessCallback process;
-
-	public RuleActionFactory(ILaunchProcessCallback process) {
-		super();
-		this.process = process;
-	}
-
-	public IRuleAction getAction(ISynchronizationRule rule) {
-		if (rule instanceof DownloadRule) {
-			DownloadRule downloadRule = (DownloadRule) rule;
-			DownloadRuleAction action = new DownloadRuleAction(process, downloadRule);
-			return action;
-		} else if (rule instanceof UploadRule) {
-			UploadRule uploadRule = (UploadRule) rule;
-			UploadRuleAction action = new UploadRuleAction(process, uploadRule);
-			return action;
-		} else if (rule instanceof DownloadBackRule) {
-			DownloadBackRule uploadRule = (DownloadBackRule) rule;
-			DownloadBackAction action = new DownloadBackAction(process, uploadRule);
-			return action;
-		} else {
-			Assert.isLegal(false);
-			return null;
-		}
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/UploadRuleAction.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/UploadRuleAction.java
deleted file mode 100755
index ecff44d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/UploadRuleAction.java
+++ /dev/null

@@ -1,385 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 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 Implementation
- *     Roland Schulz, University of Tennessee
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal;
-
-import java.io.File;
-import java.io.PrintWriter;
-
-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.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.remotetools.core.IRemoteCopyTools;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.core.IRemoteFileTools;
-import org.eclipse.ptp.remotetools.core.IRemoteItem;
-import org.eclipse.ptp.remotetools.core.IRemoteStatusTools;
-import org.eclipse.ptp.remotetools.environment.launcher.core.LinuxPath;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ExecutionConfiguration;
-import org.eclipse.ptp.remotetools.environment.launcher.data.OverwritePolicies;
-import org.eclipse.ptp.remotetools.environment.launcher.data.UploadRule;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-import org.eclipse.ptp.utils.core.file.FileRecursiveEnumeration;
-
-public class UploadRuleAction implements IRuleAction {
-	
-	private ILaunchProcessCallback process;
-	private UploadRule rule;
-	private ExecutionConfiguration configuration;
-	private PrintWriter outputWriter;
-	private PrintWriter errorWriter;
-	private IRemoteExecutionManager manager;
-	private DownloadBackRule downloadBackRule;
-	private long clockSkew;
-
-	public UploadRuleAction(ILaunchProcessCallback process, UploadRule uploadRule) {
-		super();
-		this.process = process;
-		this.rule = uploadRule;
-		configuration = process.getConfiguration();
-		outputWriter = process.getOutputWriter();
-		errorWriter = process.getErrorWriter();	
-		manager = process.getExecutionManager();
-	}
-
-	public void run() throws CoreException, CancelException, RemoteConnectionException {
-		Assert.isNotNull(process);
-		Assert.isNotNull(rule);
-		Assert.isNotNull(configuration);
-		Assert.isNotNull(outputWriter);
-		Assert.isNotNull(errorWriter);
-		Assert.isNotNull(manager);
-
-		/*
-		 * If overwrite policy depends on time, then get remote clock skew.
-		 */
-		if (rule.getOverwritePolicy() == OverwritePolicies.NEWER) {
-			IRemoteStatusTools statusTools = manager.getRemoteStatusTools();
-			long localTime;
-			long remoteTime;
-			try {
-				localTime = System.currentTimeMillis();
-				remoteTime = statusTools.getTime();
-				clockSkew = localTime -remoteTime;
-			} catch (RemoteOperationException e) {
-				errorWriter.println(NLS.bind(Messages.UploadRuleAction_0, e.getMessage()));			
-				errorWriter.println(Messages.UploadRuleAction_1);
-				clockSkew = 0;
-			}
-			if (clockSkew < -15000) {
-				errorWriter.println(Messages.UploadRuleAction_2);
-			} else if (clockSkew > 15000) {
-				errorWriter.println(Messages.UploadRuleAction_3);				
-			}
-		}
-		
-		/*
-		 * Determine remote path. Make it absolute.
-		 */
-		IPath defaultRemotePath = configuration.getRemoteDirectoryPath();
-		IPath remotePath = null;
-		if (rule.isDefaultRemoteDirectory()) {
-			remotePath = defaultRemotePath;
-		} else {
-			remotePath = LinuxPath.fromString(rule.getRemoteDirectory());
-			if (! remotePath.isAbsolute()) {
-				remotePath = defaultRemotePath.append(remotePath);
-			}
-		}
-		remotePath = remotePath.removeTrailingSeparator();
-		Assert.isTrue(remotePath.isAbsolute(), "remotePath.isAbsolute()"); //$NON-NLS-1$
-		
-		/*
-		 * Determine list of local paths. Make them absolute.
-		 */
-		IPath localPaths [] = rule.getLocalFilesAsPathArray();
-		IPath workspace = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-		for (int i = 0; i < localPaths.length; i++) {
-			IPath localPath = localPaths[i];
-			if (!localPath.isAbsolute()) {
-				localPath = workspace.append(localPath);
-			}
-			localPath = localPath.removeTrailingSeparator();
-			Assert.isTrue(localPath.isAbsolute(), "localPath.isAbsolute()"); //$NON-NLS-1$
-			localPaths[i] = localPath;
-		}
-		
-		/*
-		 * Process paths.
-		 */
-		for (int i = 0; i < localPaths.length; i++) {
-			IPath localPath = localPaths[i];
-			
-			File localFile = localPath.toFile();
-			if (! localFile.exists()) {
-				errorWriter.println(NLS.bind(Messages.UploadRuleAction_4, localFile.toString()));
-				continue;
-			} else if (localFile.isDirectory()) {
-				uploadDirectory(localFile, remotePath);
-			} else if (localFile.isFile()) {
-				uploadFile(localFile, remotePath);
-			} else {
-				errorWriter.println(NLS.bind(Messages.UploadRuleAction_5, localFile.toString()));
-				continue;				
-			}
-		}
-		
-		/*
-		 * If a download back rule was created during the upload,
-		 * the add this rule the the list of synchronize rules.
-		 */
-		if (downloadBackRule != null) {
-			process.addSynchronizationRule(downloadBackRule);
-		}
-	}
-
-	private void uploadFile(File localFile, IPath remoteDirectoryPath) throws CoreException, CancelException, RemoteConnectionException {
-		Assert.isTrue(localFile.isAbsolute(), "localFile.isAbsolute()"); //$NON-NLS-1$
-		Assert.isTrue(remoteDirectoryPath.isAbsolute(), "remoteDirectoryPath.isAbsolute()"); //$NON-NLS-1$
-		
-		IPath remoteFile = remoteDirectoryPath.append(localFile.getName());
-		outputWriter.println(NLS.bind(Messages.UploadRuleAction_6, localFile.toString()));
-		outputWriter.println(NLS.bind(Messages.UploadRuleAction_7, LinuxPath.toString(remoteFile)));
-
-		doFileUpload(localFile, remoteFile);
-	}
-
-	private void doFileUpload(File localFile, IPath remotePath) throws CoreException, CancelException, RemoteConnectionException {		
-		if (! localFile.exists()) {
-			errorWriter.println(NLS.bind(Messages.UploadRuleAction_8, localFile.toString()));
-			return;
-		}
-
-		Assert.isTrue(localFile.isAbsolute(), "localFile.isAbsolute()"); //$NON-NLS-1$
-		Assert.isTrue(localFile.isFile(), "localFile.isFile()"); //$NON-NLS-1$
-		Assert.isTrue(remotePath.isAbsolute(), "remotePath.isAbsolute()"); //$NON-NLS-1$
-		
-		String remotePathAsString = LinuxPath.toString(remotePath);
-
-		IRemoteCopyTools copyTools = manager.getRemoteCopyTools();
-		IRemoteFileTools fileTools = manager.getRemoteFileTools();
-				
-		/*
-		 * Check if file exists and if file is newer, depending on overwrite policy.
-		 */
-		if (rule.getOverwritePolicy() == OverwritePolicies.ALWAYS) {
-			/*
-			 * File is always copied, no policy.
-			 */
-		} else {
-			/*
-			 * Policy needs to check remote file.
-			 */
-			IRemoteItem remoteFile = null;
-			try {
-				remoteFile = fileTools.getFile(remotePathAsString, null);
-			} catch (RemoteOperationException e) {
-				errorWriter.println(NLS.bind(Messages.UploadRuleAction_9, e.getMessage()));
-				return;
-			}
-			if (rule.getOverwritePolicy() == OverwritePolicies.SKIP) {
-				if (remoteFile.exists()) {
-					outputWriter.println(NLS.bind(Messages.UploadRuleAction_10, remotePath));
-					return;
-				}
-			} else if (rule.getOverwritePolicy() == OverwritePolicies.NEWER) {
-				long difference = localFile.lastModified() - remoteFile.getModificationTime();
-				if (difference < 1000) {
-					outputWriter.println(NLS.bind(Messages.UploadRuleAction_11, remotePath));
-					return;					
-				}
-			}
-		}  
-		
-		/*
-		 * Upload the file.
-		 */
-		try {
-			copyTools.uploadFileToFile(localFile, remotePathAsString);
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind(Messages.UploadRuleAction_12, e.getMessage()));
-			return;
-		}
-	
-		/*
-		 * Add file to list of files to download back, if this feature was enabled.
-		 */
-		if (rule.isDownloadBack()) {
-			if (downloadBackRule == null) {
-				downloadBackRule = new DownloadBackRule();
-			}
-			downloadBackRule.add(localFile, remotePath);
-		}
-
-		/*
-		 * Fetch properties of file that was just uploaded.
-		 */
-		IRemoteItem remoteFile = null;
-		try {
-			remoteFile = fileTools.getFile(remotePathAsString, null);
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind(Messages.UploadRuleAction_13, e.getMessage()));
-			return;
-		}
-		
-		/*
-		 * Set file permissions. We need help of EFS, since the File class from
-		 * Java does not providel all information.
-		 */
-		IFileSystem localFileSystem = EFS.getLocalFileSystem();
-		IFileStore fileStore = localFileSystem.getStore(new Path(localFile.getPath()));
-		IFileInfo fileInfo = fileStore.fetchInfo();
-
-		boolean read = localFile.canRead();
-		boolean write = localFile.canWrite();
-		boolean execute = fileInfo.getAttribute(EFS.ATTRIBUTE_EXECUTABLE);
-		
-		if (rule.isAsReadOnly()) {
-			write = false;
-		}
-		if (rule.isAsExecutable()) {
-			execute = true;
-		}
-		
-		remoteFile.setExecutable(execute);
-		remoteFile.setWriteable(write);
-		remoteFile.setReadable(read);
-		
-		/*
-		 * Set date/time, if required
-		 */
-		if (rule.isPreserveTimeStamp()) {
-			long timestamp = localFile.lastModified();
-			remoteFile.setModificationTime(timestamp);
-		}
-
-		/*
-		 * Commit changes
-		 */
-		try {
-			remoteFile.commitAttributes(null);
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind(Messages.UploadRuleAction_14, e.getMessage()));
-			return;
-		}
-	}
-	
-	private void doDirectoryUpload(File localDir, IPath remotePath) throws RemoteConnectionException, CancelException {
-		if (! localDir.exists()) {
-			errorWriter.println(NLS.bind(Messages.UploadRuleAction_15, localDir.toString()));
-			return;
-		}
-
-		Assert.isTrue(localDir.isDirectory(), "localFile.isDirectory()"); //$NON-NLS-1$
-		Assert.isTrue(localDir.isAbsolute(), "localFile.isAbsolute()"); //$NON-NLS-1$
-		Assert.isTrue(remotePath.isAbsolute(), "remotePath.isAbsolute()"); //$NON-NLS-1$
-
-		IRemoteFileTools fileTools = manager.getRemoteFileTools();
-		
-		/*
-		 * Create remote directory if not already exists.
-		 */
-		try {
-			fileTools.assureDirectory(LinuxPath.toString(remotePath), null);
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind(Messages.UploadRuleAction_16, e.getMessage()));
-			return;
-		}
-	
-		/*
-		 * Fetch properties of directory that was just uploaded.
-		 */
-		IRemoteItem remoteDirectory = null;
-		try {
-			remoteDirectory = fileTools.getDirectory(LinuxPath.toString(remotePath), null);
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind(Messages.UploadRuleAction_17, e.getMessage()));
-			return;
-		}
-		
-		/*
-		 * Set file permissions.
-		 */
-		boolean read = localDir.canRead();
-		boolean write = localDir.canWrite();
-		boolean execute = true;
-		
-		if (rule.isAsReadOnly()) {
-			write = false;
-		}
-		
-		remoteDirectory.setExecutable(execute);
-		remoteDirectory.setWriteable(write);
-		remoteDirectory.setReadable(read);
-		
-		/*
-		 * Set date/time, if required
-		 */
-		if (rule.isPreserveTimeStamp()) {
-			long timestamp = localDir.lastModified();
-			remoteDirectory.setModificationTime(timestamp);
-		}
-
-		/*
-		 * Commit changes
-		 */
-		try {
-			remoteDirectory.commitAttributes(null);
-		} catch (RemoteOperationException e) {
-			errorWriter.println(NLS.bind(Messages.UploadRuleAction_18, e.getMessage()));
-			return;
-		}		
-	}
-
-
-	private void uploadDirectory(File localDir, IPath remotePath) throws CoreException, CancelException, RemoteConnectionException {
-		Assert.isTrue(localDir.isAbsolute(), "localDir.isAbsolute()"); //$NON-NLS-1$
-		Assert.isTrue(remotePath.isAbsolute(), "remotePath.isAbsolute()"); //$NON-NLS-1$
-
-		outputWriter.println(NLS.bind(Messages.UploadRuleAction_19, localDir.toString()));
-		outputWriter.println(NLS.bind(Messages.UploadRuleAction_20, LinuxPath.toString(remotePath)));
-
-		FileRecursiveEnumeration enumeration = null;
-		enumeration = new FileRecursiveEnumeration(localDir);
-		
-		IPath rootPath = new Path(localDir.getAbsolutePath());
-		int rootPathLength = rootPath.segmentCount();
-		while (enumeration.hasMoreElements()) {
-			while (enumeration.hasMoreExceptions()) {
-				errorWriter.println(NLS.bind(Messages.UploadRuleAction_21, enumeration.nextException()));	
-			}
-			File file = (File) enumeration.nextElement();
-			IPath filePath = new Path(file.getAbsolutePath());
-			IPath relativePath = filePath.removeFirstSegments(rootPathLength);
-			IPath remoteFilePath = remotePath.append(relativePath);
-			if (file.isDirectory()) {
-				outputWriter.println(NLS.bind(Messages.UploadRuleAction_22, LinuxPath.toString(remoteFilePath)));
-				doDirectoryUpload(file, remoteFilePath);
-			} else {
-				outputWriter.println(NLS.bind(Messages.UploadRuleAction_23, LinuxPath.toString(relativePath)));
-				doFileUpload(file, remoteFilePath);
-			}
-		}
-		while (enumeration.hasMoreExceptions()) {
-			errorWriter.println(NLS.bind(Messages.UploadRuleAction_24, enumeration.nextException()));	
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/integration/NullLaunchObserver.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/integration/NullLaunchObserver.java
deleted file mode 100755
index 5ff608f..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/integration/NullLaunchObserver.java
+++ /dev/null

@@ -1,22 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal.integration;
-
-import org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchObserver;
-import org.eclipse.ptp.remotetools.environment.launcher.core.NullLaunchIntegration;
-
-public class NullLaunchObserver extends NullLaunchIntegration implements ILaunchObserver {
-	public void receiveOutput(String text) {
-		// TODO Auto-generated method stub
-		
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/macros/LaunchMacroSupplier.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/macros/LaunchMacroSupplier.java
deleted file mode 100755
index 1d6c658..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/macros/LaunchMacroSupplier.java
+++ /dev/null

@@ -1,130 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal.macros;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.cdt.core.cdtvariables.ICdtVariable;
-import org.eclipse.cdt.internal.core.cdtvariables.CoreMacroSupplierBase;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.ptp.remotetools.environment.launcher.macros.ILaunchConfigurationVariableSupplier;
-import org.eclipse.ptp.remotetools.environment.launcher.macros.ILaunchVariableContextInfo;
-import org.eclipse.ptp.utils.core.extensionpoints.IProcessMemberVisitor;
-import org.eclipse.ptp.utils.core.extensionpoints.ProcessExtensions;
-
-/**
- * @author laggarcia
- * @since 3.0.0
- */
-public class LaunchMacroSupplier extends CoreMacroSupplierBase {
-
-	public static final String EXT_LAUNCH_CONFIGURATION_MACRO_SUPPLIER = "org.eclipse.ptp.remotetools.environment.launcher.launchConfigurationMacroSupplier"; //$NON-NLS-1$
-
-	private static LaunchMacroSupplier instance;
-
-	private final Map auxiliarySuppliers = new HashMap();
-
-	private static final String CONFIG_TYPE_ID = "configTypeId"; //$NON-NLS-1$
-
-	private static final String CLASS = "class"; //$NON-NLS-1$
-
-	private LaunchMacroSupplier() {
-	}
-
-	public static LaunchMacroSupplier getInstance() {
-		if (instance == null) {
-			instance = new LaunchMacroSupplier();
-		}
-		return instance;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroSupplier#getMacro(java.lang.String,
-	 *      int, java.lang.Object)
-	 */
-	public ICdtVariable getMacro(String macroName, int contextType,
-			Object contextData) {
-		switch (contextType) {
-		case ILaunchVariableContextInfo.CONTEXT_LAUNCH:
-			if (contextData instanceof ILaunchConfiguration) {
-				loadLaunchConfigurationMacroSuppliers();
-				try {
-					ILaunchConfigurationType launchConfigurationType = ((ILaunchConfiguration) contextData)
-							.getType();
-					ILaunchConfigurationVariableSupplier launchConfigurationMacroSupplier = (ILaunchConfigurationVariableSupplier) this.auxiliarySuppliers
-							.get(launchConfigurationType.getIdentifier());
-					return launchConfigurationMacroSupplier.getVariable(
-							macroName, (ILaunchConfiguration) contextData);
-				} catch (CoreException e) {
-					e.printStackTrace();
-				}
-			}
-			break;
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroSupplier#getMacros(int,
-	 *      java.lang.Object)
-	 */
-	public ICdtVariable[] getMacros(int contextType, Object contextData) {
-		switch (contextType) {
-		case ILaunchVariableContextInfo.CONTEXT_LAUNCH:
-			if (contextData instanceof ILaunchConfiguration) {
-				loadLaunchConfigurationMacroSuppliers();
-				try {
-					ILaunchConfigurationType launchConfigurationType = ((ILaunchConfiguration) contextData)
-							.getType();
-					ILaunchConfigurationVariableSupplier launchConfigurationMacroSupplier = (ILaunchConfigurationVariableSupplier) this.auxiliarySuppliers
-							.get(launchConfigurationType.getIdentifier());
-					return launchConfigurationMacroSupplier
-							.getVariables((ILaunchConfiguration) contextData);
-				} catch (CoreException e) {
-					e.printStackTrace();
-				}
-			}
-		}
-		return null;
-	}
-
-	private void loadLaunchConfigurationMacroSuppliers() {
-		if (this.auxiliarySuppliers.isEmpty()) {
-			ProcessExtensions.process(EXT_LAUNCH_CONFIGURATION_MACRO_SUPPLIER,
-					new IProcessMemberVisitor() {
-						public Object process(IExtension extension,
-								IConfigurationElement member) {
-							try {
-								LaunchMacroSupplier.this.auxiliarySuppliers
-										.put(
-												member
-														.getAttribute(CONFIG_TYPE_ID),
-												member
-														.createExecutableExtension(CLASS));
-							} catch (Exception e) {
-								e.printStackTrace();
-							}
-							return null;
-						}
-					});
-		}
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/macros/LaunchVariableContextInfo.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/macros/LaunchVariableContextInfo.java
deleted file mode 100755
index 085be12..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/macros/LaunchVariableContextInfo.java
+++ /dev/null

@@ -1,96 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal.macros;
-
-import org.eclipse.cdt.utils.cdtvariables.ICdtVariableSupplier;
-import org.eclipse.cdt.utils.cdtvariables.IVariableContextInfo;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ptp.remotetools.environment.launcher.macros.ILaunchVariableContextInfo;
-
-
-/**
- * @author laggarcia
- * @since 3.0.0
- */
-public class LaunchVariableContextInfo implements ILaunchVariableContextInfo {
-
-	private int type;
-
-	private Object data;
-
-	public LaunchVariableContextInfo(int type, Object data) {
-		this.type = type;
-		this.data = data;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.cdt.managedbuilder.internal.macros.IMacroContextInfo#getContextData()
-	 */
-	public Object getContextData() {
-		return this.data;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.cdt.managedbuilder.internal.macros.IMacroContextInfo#getContextType()
-	 */
-	public int getContextType() {
-		return this.type;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.cdt.managedbuilder.internal.macros.IMacroContextInfo#getNext()
-	 */
-	public IVariableContextInfo getNext() {
-		switch (this.type) {
-		case CONTEXT_LAUNCH:
-			if (this.data instanceof ILaunchConfiguration) {
-				IWorkspace wsp = ResourcesPlugin.getWorkspace();
-				if (wsp != null) {
-					return new LaunchVariableContextInfo(CONTEXT_WORKSPACE, wsp);
-				}
-			}
-			break;
-		case CONTEXT_WORKSPACE:
-			return null;
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.cdt.managedbuilder.internal.macros.IMacroContextInfo#getSuppliers()
-	 */
-	public ICdtVariableSupplier[] getSuppliers() {
-		switch (this.type) {
-		case CONTEXT_LAUNCH:
-			if (this.data instanceof ILaunchConfiguration) {
-				return new ICdtVariableSupplier[] { LaunchVariableManager.launchMacroSupplier };
-			}
-			break;
-		case CONTEXT_WORKSPACE:
-			if (this.data instanceof IWorkspace) {
-				return new ICdtVariableSupplier[] { LaunchVariableManager.eclipseVariablesMacroSupplier };
-			}
-			break;
-		}
-		return null;
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/macros/LaunchVariableManager.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/macros/LaunchVariableManager.java
deleted file mode 100755
index 92258d9..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/macros/LaunchVariableManager.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal.macros;
-
-import org.eclipse.cdt.core.cdtvariables.CdtVariableException;
-import org.eclipse.cdt.internal.core.cdtvariables.CoreVariableSubstitutor;
-import org.eclipse.cdt.internal.core.cdtvariables.EclipseVariablesVariableSupplier;
-import org.eclipse.cdt.utils.cdtvariables.CdtVariableResolver;
-import org.eclipse.cdt.utils.cdtvariables.IVariableContextInfo;
-import org.eclipse.cdt.utils.cdtvariables.IVariableSubstitutor;
-import org.eclipse.ptp.remotetools.environment.launcher.macros.ILaunchVariableManager;
-
-
-/**
- * This class is similar to
- * org.eclipse.cdt.internal.core.cdtvariables.CdtVariableManager
- * 
- * @author laggarcia
- * @since 3.0.0
- */
-public class LaunchVariableManager implements ILaunchVariableManager {
-
-	private static LaunchVariableManager instance;
-
-	public static LaunchMacroSupplier launchMacroSupplier = LaunchMacroSupplier
-			.getInstance();
-
-	public static EclipseVariablesVariableSupplier eclipseVariablesMacroSupplier = EclipseVariablesVariableSupplier
-			.getInstance();
-
-	public LaunchVariableManager() {
-	}
-
-	public static LaunchVariableManager getDefault() {
-		if (instance == null)
-			instance = new LaunchVariableManager();
-		return instance;
-	}
-
-	public String resolveValue(String value, String nonexistentMacrosValue,
-			String listDelimiter, int contextType, Object contextData)
-			throws CdtVariableException {
-
-		IVariableContextInfo info = getMacroContextInfo(contextType, contextData);
-		if (info != null)
-			return CdtVariableResolver.resolveToString(value, getMacroSubstitutor(
-					info, nonexistentMacrosValue, listDelimiter));
-		return null;
-
-	}
-
-	public IVariableContextInfo getMacroContextInfo(int contextType,
-			Object contextData) {
-		LaunchVariableContextInfo info = new LaunchVariableContextInfo(contextType,
-				contextData);
-		if (info.getSuppliers() != null)
-			return info;
-		return null;
-	}
-
-	public IVariableSubstitutor getMacroSubstitutor(IVariableContextInfo info,
-			String inexistentMacroValue, String listDelimiter) {
-		return new CoreVariableSubstitutor(info, inexistentMacroValue,
-				listDelimiter);
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/messages.properties
deleted file mode 100755
index 5c0a5e9..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/messages.properties
+++ /dev/null

@@ -1,116 +0,0 @@
-###############################################################################
-# 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
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-
-RemoteLaunchProcess_1=* Prepare launch by executing:
-RemoteLaunchProcess_10=* Started application on target.
-RemoteLaunchProcess_11=Remote process
-RemoteLaunchProcess_12=\ \ \ Execution was canceled
-RemoteLaunchProcess_13=\ \ \ Finished with exit code: 
-RemoteLaunchProcess_14=\ \ \ Finished successfully
-RemoteLaunchProcess_15=\ \ \ Finished with exception: 
-RemoteLaunchProcess_16=\ \ \ Could not run application: 
-RemoteLaunchProcess_17=\ \ \ Failed.
-RemoteLaunchProcess_18=\ \ \ Failed: 
-RemoteLaunchProcess_19=Connection to host failed.
-RemoteLaunchProcess_2=\ \ \ Script executed successfully.
-RemoteLaunchProcess_20=\ \ \ Failed to execute: 
-RemoteLaunchProcess_21=* Launch configuration does not require cleaning up remote working directory.
-RemoteLaunchProcess_22=* Cleaning up remote working directory: 
-RemoteLaunchProcess_23=\ \ \ Clean up complete
-RemoteLaunchProcess_24=\ \ \ Clean up failed: 
-RemoteLaunchProcess_25=Could not clean up target.
-RemoteLaunchProcess_26=Connection to host failed.
-RemoteLaunchProcess_27=*** The launch did not work correctly ***
-RemoteLaunchProcess_28=\ \ \ \ An exception was thrown during the launch: 
-RemoteLaunchProcess_3=\ \ \ Script returned 
-RemoteLaunchProcess_4=\ \ \ Script failed: 
-RemoteLaunchProcess_5=Connection to host failed.
-RemoteLaunchProcess_6=* Launch configuration does not require running a bash script after launch.
-RemoteLaunchProcess_7=* Finalize launch by executing:
-RemoteLaunchProcess_8=Connection to host failed.
-RemoteLaunchProcess_9=* Launch configuration does not require running the executable.
-RemoteLaunchProcess_0=* Launch configuration does not require running a bash script before launch.
-RemoteLaunchProcess_RequestToCancelLaunch=Requested to cancel this launch.
-RemoteLaunchProcess_PrepareWorkingDir_NotRequired=* Launch configuration does not require creating remote directory.
-RemoteLaunchProcess_UploadWorkingDirectory_Title=* Synchronize before launch:
-RemoteLaunchProcess_UploadApplication_Title=* Upload application executable file.
-RemoteLaunchProcess_PrepareWorkingDir_Title=* Creating remote working directory: {0}
-RemoteLaunchProcess_PrepareWorkingDir_FailedCreate=\ \ \ Failed to create remote working directory: {0}
-RemoteLaunchProcess_UploadWorkingDirectory_NoRules=\ \ \ No rules were specified for this launch.
-RemoteLaunchProcess_UploadApplication_TitleNoUpload=* Launch configuration does not require uploading the executable file.
-RemoteLaunchProcess_UploadApplication_UploadMessage=\ \ \ Upload executable {0}\n   to {1} (remote)
-RemoteLaunchProcess_UploadApplication_FailedUpload=\ \ \ Upload failed: {0}
-RemoteLaunchProcess_PrepareWorkingDir_FailedCreateHint=\ \ \ Check if the directory already exists or is owned by another user.
-RemoteLaunchProcess_UploadWorkingDirectory_FailedRule=\ \ \ Rule {0} failed: {1}
-RemoteLaunchProcess_UploadApplication_CompletedUpload=\ \ \ Upload completed.
-RemoteLaunchProcess_PrepareWorkingDir_Failed=Could not prepare working directory.
-RemoteLaunchProcess_All_FailedConnection=Connection to host failed.
-RemoteLaunchProcess_Failed=Could not upload executable file.
-RemoteLaunchProcess_FailedPermissions=\ \ \ Failed to set permissions on executable file: {0}
-RemoteLaunchProcess_PrepareWorkingDir_FailedPermissions=\ \ \ Failed to set permissions on remote working directory: {0}
-RemoteLaunchProcess_UploadWorkingDirectory_TitleUploadDisabled=* Launch configuration does not require synchronize before launch.
-RemoteLaunchProcess_UploadWorkingDirectory_IgnoreInactive=\ \ \ Ignoring inactive rule {0}
-RemoteLaunchProcess_UploadWorkingDirectory_IgnoreInvalid=\ \ \ Ignoring rule {0}: {1}
-RemoteLaunchProcess_DownloadWorkingDirectory_TitleDownloadDisabled=* Launch configuration does not require synchronize after launch.
-RemoteLaunchProcess_DownloadWorkingDirectory_Title=* Synchronize after launch:
-RemoteLaunchProcess_DownloadWorkingDirectory_IgnoreInactive=\ \ \ Ignoring inactive rule {0}
-RemoteLaunchProcess_DownloadWorkingDirectory_IgnoreInvalid=\ \ \ Ignoring rule {0}: {1}
-RemoteLaunchProcess_DownloadWorkingDirectory_FailedRule=\ \ \ Rule {0} failed: {1}
-DownloadBackAction_FailedFetchRemoteProperties=\ \ \ Could not fetch properties for remote file: {0}
-DownloadRuleAction_FailedCalculateClockDifference=\ \ \ Could not calculate clock difference with remote host: {0}
-DownloadRuleAction_FailedCalculateClockDifference2=\ \ \ Assuming same a remote clock synchronized with local clock.
-DownloadRuleAction_FailedCreateLocalDirectory=\ \ \ Cannot create local directory {0}
-DownloadRuleAction_FailedLocalDiretoryIsNotDirectory=\ \ \ Path {0} exists, but is not a directory
-DownloadRuleAction_FailedRemotePathDoesNotExit=\ \ \ Ignoring {0}: Path does not exist remotely
-DownloadRuleAction_FailedFetchRemoteAttributes=\ \ \ Could not fetch attributes of remote file/directory: {0}
-DownloadRuleAction_NotiftNewerFileExistsLocally=\ \ \ A newer file alredy exists locally, ignoring it: {0}
-DownloadRuleAction_FailedSetLocalFileAttributes=\ \ \ Failed to set attributes of local file: {0}
-DownloadRuleAction_FailedSetLocalDirectoryAttributes=\ \ \ Failed to set attributes of local directory: {0}
-DownloadBackAction_FailedFiledDoesNotExist=\ \ \ Remote file does not exist anymore: {0}
-DownloadRuleAction_NotifyDirectoryDownload1=\ \ \ Copying contents of directory {0} (remote)
-DownloadRuleAction_NotifyDirectoryDownload2=\ \ \ into directory {0} (local)
-DownloadRuleAction_NotiftFileExistsLocally=\ \ \ File alredy exists locally, ignoring it: {0}
-DownloadBackAction_NotifyFileNotChanged=\ \ \ File {0} was not changed on remote target.
-DownloadRuleAction_WarningClockBackward=\ \ \ Warning\! Clock at remote target is older than local clock. File synchronization may not be correct.
-DownloadRuleAction_FailedFetchAttributes=\ \ \ Ignoring {0}: Cannot fetch attributes
-DownloadRuleAction_FailedSetDownloadFile=\ \ \ Could not download file: {0}
-DownloadBackAction_NotifyDonwloadBack=\ \ \ Download back file {0}.
-DownloadBackAction_FailedDownloadBack=\ \ \ Could not download file: {0}
-DownloadBackRule_0=Internal download back rule
-DownloadRuleAction_WarningClockForward=\ \ \ Warning\! Clock at remote target is more recent than local clock. File synchronization may not be correct.
-DownloadRuleAction_FailedRemotePathNoDirectoryNorFile=\ \ \ Ignoring {0}: Path is not a remote file nor directory
-DownloadRuleAction_NotifyFileDownload1=\ \ \ Copying file {0} (remote)
-DownloadRuleAction_NotifyFileDownload2=\ \ \ to file {0} (local)
-UploadRuleAction_0=\ \ \ Could not calculate clock difference with remote host: {0}
-UploadRuleAction_1=\ \ \ Assuming same a remote clock synchronized with local clock.
-UploadRuleAction_10=\ \ \ File alredy exists on remote target, ignoring it: {0}
-UploadRuleAction_11=\ \ \ A newer file alredy exists on remote target, ignoring it: {0}
-UploadRuleAction_12=\ \ \ Could not upload file: {0}
-UploadRuleAction_13=\ \ \ Could not fetch properties for uploaded file: {0}
-UploadRuleAction_14=\ \ \ Could not write properties for uploaded file: {0}
-UploadRuleAction_15=\ \ \ Ignoring {0}: Directory does not exist locally
-UploadRuleAction_16=\ \ \ Could not create remote directory: {0}
-UploadRuleAction_17=\ \ \ Could not fetch properties for created remote directory: {0}
-UploadRuleAction_18=\ \ \ Could not write properties for uploaded directory: {0}
-UploadRuleAction_19=\ \ \ Copying contents of directory {0} (local)
-UploadRuleAction_2=\ \ \ Warning\! Clock at remote target is more recent than local clock. File synchronization may not be correct.
-UploadRuleAction_20=\ \ \ into directory {0} (remote)
-UploadRuleAction_21=\ \ \ Could not read file/directory: {0}
-UploadRuleAction_22=\ \ \ Create remote directory {0}
-UploadRuleAction_23=\ \ \ Upload {0}
-UploadRuleAction_24=\ \ \ Could not read file/directory: {0}
-UploadRuleAction_3=\ \ \ Warning\! Clock at remote target is older than local clock. File synchronization may not be correct.
-UploadRuleAction_4=\ \ \ Ignoring {0}: Path does not exist locally
-UploadRuleAction_5=\ \ \ Ignoring {0}: Path is not a file nor directory
-UploadRuleAction_6=\ \ \ Copying file {0} (local)
-UploadRuleAction_7=\ \ \ to file {0} (remote)
-UploadRuleAction_8=\ \ \ Ignoring {0}: File does not exist locally
-UploadRuleAction_9=\ \ \ Could not fetch properties for remote file, ignoring it: {0}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/AbstractProcess.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/AbstractProcess.java
deleted file mode 100755
index 4d382e9..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/AbstractProcess.java
+++ /dev/null

@@ -1,167 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal.process;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.debug.core.model.IProcess;
-
-/**
- * A process that behaves as it were a real running process.
- * <p>
- * Used to test and understand Eclipse Debugger and Launch facilities.
- * @author Daniel Felix Ferber
- */
-public abstract class AbstractProcess extends PlatformObject implements IProcess {
-	
-	protected String label = Messages.AbstractProcess_DefaultLabel;
-	static int counter;
-	
-	/**
-	 * The launch this process is contained in
-	 */
-	protected ILaunch launch;
-	
-	/**
-	 * Table of client defined attributes
-	 */
-	protected Map attributes;
-		
-	/**
-	 * Whether output from the process should be captured or swallowed
-	 */
-	protected boolean captureOutput = true;
-	
-	public AbstractProcess(ILaunch launch, String label) {
-		super();
-		this.launch = launch;
-		
-		if (label == null) {
-			counter++;
-			this.label = "bogus "+Integer.toString(counter); //$NON-NLS-1$
-		} else {
-			this.label = label;
-		}
-		
-		String captureOutputValue = launch.getAttribute(DebugPlugin.ATTR_CAPTURE_OUTPUT);
-		captureOutput = !("false".equals(captureOutputValue)); //$NON-NLS-1$
-	}
-	
-	public void start() {
-		launch.addProcess(this);
-		fireCreationEvent();
-		fireChangeEvent();
-	}
-	
-	public String getLabel() {
-		return label;
-	}
-
-	public ILaunch getLaunch() {
-		return launch;
-	}
-
-	public void setAttribute(String key, String value) {
-		if (attributes == null) {
-			attributes = new HashMap(5);
-		}
-		Object origVal = attributes.get(key);
-		if (origVal != null && origVal.equals(value)) {
-			return; //nothing changed.
-		}
-		
-		attributes.put(key, value);
-		fireChangeEvent();
-	}
-
-	public String getAttribute(String key) {
-		if (attributes == null) {
-			return null;
-		}
-		return (String)attributes.get(key);
-	}
-	
-	/**
-	 * Copy the attributes of this process to those in the given map.
-	 * 
-	 * @param attributes attribute map or <code>null</code> if none
-	 */
-	public void copyAttributes(Map attributes) {
-		if (attributes != null) {
-			Iterator keys = attributes.keySet().iterator();
-			while (keys.hasNext()) {
-				String key = (String)keys.next();
-				setAttribute(key, (String)attributes.get(key));
-			}	
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (adapter.equals(IProcess.class)) {
-			return this;
-		}
-		if (adapter.equals(IDebugTarget.class)) {
-			ILaunch launch = getLaunch();
-			IDebugTarget[] targets = launch.getDebugTargets();
-			for (int i = 0; i < targets.length; i++) {
-				if (this.equals(targets[i].getProcess())) {
-					return targets[i];
-				}
-			}
-			return null;
-		}
-		return super.getAdapter(adapter);
-	}
-
-	/**
-	 * Fires a creation event.
-	 */
-	protected void fireCreationEvent() {
-		fireEvent(new DebugEvent(this, DebugEvent.CREATE));
-	}
-
-	/**
-	 * Fires the given debug event.
-	 * 
-	 * @param event debug event to fire
-	 */
-	protected void fireEvent(DebugEvent event) {
-		DebugPlugin manager= DebugPlugin.getDefault();
-		if (manager != null) {
-			manager.fireDebugEventSet(new DebugEvent[]{event});
-		}
-	}
-
-	/**
-	 * Fires a terminate event.
-	 */
-	protected void fireTerminateEvent() {
-		fireEvent(new DebugEvent(this, DebugEvent.TERMINATE));
-	}
-
-	/**
-	 * Fires a change event.
-	 */	
-	protected void fireChangeEvent() {
-		fireEvent(new DebugEvent(this, DebugEvent.CHANGE));
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/ExecutionStreamsProxy.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/ExecutionStreamsProxy.java
deleted file mode 100755
index ea3ffe5..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/ExecutionStreamsProxy.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal.process;
-
-import java.io.IOException;
-
-import org.eclipse.debug.core.model.IStreamMonitor;
-import org.eclipse.debug.core.model.IStreamsProxy;
-import org.eclipse.debug.core.model.IStreamsProxy2;
-
-class ExecutionStreamsProxy implements IStreamsProxy, IStreamsProxy2 {
-	final IStreamMonitor errorStreamMonitor;
-	final IStreamMonitor outputStreamMonitor;
-	
-	public ExecutionStreamsProxy(final IStreamMonitor errorStreamMonitor, final IStreamMonitor outputStreamMonitor) {
-		super();
-		this.errorStreamMonitor = errorStreamMonitor;
-		this.outputStreamMonitor = outputStreamMonitor;
-	}
-
-	public IStreamMonitor getErrorStreamMonitor() {
-		return errorStreamMonitor;
-	}
-
-	public IStreamMonitor getOutputStreamMonitor() {
-		return outputStreamMonitor;
-	}
-
-	public void write(String input) throws IOException {
-		// Ignore, it is not possible to write to TargetProcess
-	}
-
-	public void closeInputStream() throws IOException {
-		// Ignore until deciding how to handle close
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/Messages.java
deleted file mode 100755
index 874566d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/Messages.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal.process;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remotetools.environment.launcher.internal.process.messages"; //$NON-NLS-1$
-
-	public static String AbstractProcess_DefaultLabel;
-
-	public static String TargetProcess_Label;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/MonitorOutputStream.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/MonitorOutputStream.java
deleted file mode 100755
index 73dbd1c..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/MonitorOutputStream.java
+++ /dev/null

@@ -1,67 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal.process;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.debug.core.IStreamListener;
-import org.eclipse.debug.core.model.IStreamMonitor;
-
-class MonitorOutputStream extends OutputStream implements IStreamMonitor {
-	private Set listeners= new HashSet(1);
-	
-	public void addListener(IStreamListener listener) {
-		listeners.add(listener);
-	}
-
-	public String getContents() {
-		return null;
-	}
-
-	public void removeListener(IStreamListener listener) {
-		listeners.remove(listener);
-
-	}
-
-	public void write(int b) throws IOException {
-		Iterator iterator = listeners.iterator();
-		while (iterator.hasNext()) {
-			IStreamListener listener = (IStreamListener) iterator.next();
-			byte bytes [] = new byte[1];
-			bytes[0] = (byte)b;
-			String text = new String(bytes);
-			listener.streamAppended(text, this);
-		}
-	}
-	
-	public void write(byte[] b) throws IOException {
-		Iterator iterator = listeners.iterator();
-		while (iterator.hasNext()) {
-			IStreamListener listener = (IStreamListener) iterator.next();
-			String text = new String(b);
-			listener.streamAppended(text, this);
-		}
-	}
-
-	public void write(byte[] b, int off, int len) throws IOException {
-		Iterator iterator = listeners.iterator();
-		while (iterator.hasNext()) {
-			IStreamListener listener = (IStreamListener) iterator.next();
-			String text = new String(b, off, len);
-			listener.streamAppended(text, this);
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/TargetProcess.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/TargetProcess.java
deleted file mode 100755
index 2b0bce0..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/TargetProcess.java
+++ /dev/null

@@ -1,105 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.internal.process;
-
-import java.io.OutputStream;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.model.IStreamsProxy;
-import org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchProcess;
-import org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchProgressListener;
-
-
-public class TargetProcess extends AbstractProcess implements ILaunchProgressListener {
-
-	final ILaunchProcess executionJob;
-	boolean wasFinished = false;
-	
-	final MonitorOutputStream monitorOutputStream = new MonitorOutputStream();
-	final MonitorOutputStream monitorErrorStream = new MonitorOutputStream();
-	final ExecutionStreamsProxy streamsProxy = new ExecutionStreamsProxy(monitorErrorStream, monitorOutputStream);
-	
-	public TargetProcess(ILaunch launch, ILaunchProcess job) {
-		super(launch, Messages.TargetProcess_Label);
-		this.executionJob = job;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IProcess#getExitValue()
-	 */
-	public int getExitValue() throws DebugException {
-		return 0;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IProcess#getStreamsProxy()
-	 */
-	public IStreamsProxy getStreamsProxy() {
-		return streamsProxy;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ITerminate#canTerminate()
-	 */
-	public boolean canTerminate() {
-		return executionJob.getCurrentProgress() != ILaunchProgressListener.FINISHED;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ITerminate#isTerminated()
-	 */
-	public boolean isTerminated() {
-		return wasFinished || ! canTerminate();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ITerminate#terminate()
-	 */
-	public void terminate() throws DebugException {
-		executionJob.markAsCanceled();
-	}
-
-	public OutputStream getOutputStream() {
-		return monitorOutputStream;
-	}
-
-	public OutputStream getErrorStream() {
-		return monitorErrorStream;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchProgressListener#notifyProgress(int)
-	 */
-	public void notifyProgress(int progress) {
-		fireChangeEvent();
-		if (progress == ILaunchProgressListener.FINISHED) {
-			fireTerminateEvent();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.remotetools.environment.launcher.core.ILaunchProgressListener#notifyInterrupt()
-	 */
-	public void notifyInterrupt() {
-		wasFinished = true;
-		fireTerminateEvent();
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/messages.properties
deleted file mode 100755
index 6bc8433..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/internal/process/messages.properties
+++ /dev/null

@@ -1,12 +0,0 @@
-###############################################################################
-# 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
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-TargetProcess_Label=Connection to target
-AbstractProcess_DefaultLabel=no label

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/macros/ILaunchConfigurationVariableSupplier.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/macros/ILaunchConfigurationVariableSupplier.java
deleted file mode 100755
index f56081b..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/macros/ILaunchConfigurationVariableSupplier.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.macros;
-
-import org.eclipse.cdt.core.cdtvariables.ICdtVariable;
-import org.eclipse.debug.core.ILaunchConfiguration;
-
-/**
- * 
- * This interface is to be implemented by the launch-integrator
- * for supplying the configuration-specific macros
- * 
- * @author laggarcia
- * @since 3.0.0
- */
-public interface ILaunchConfigurationVariableSupplier {
-
-	/**
-	 *
-	 * @param variableName the variable name
-	 * @param launchConfiguration launch configuration
-	 * @return the reference to the ICdtVariable interface representing 
-	 * the variable of a given name or null if the variable of that name is not defined
-	 */
-	public ICdtVariable getVariable(String variableName,
-			ILaunchConfiguration launchConfiguration);
-
-	/**
-	 *
-	 * @param launchConfiguration launch configuration
-	 * @return the ICdtVariable[] array representing defined variables 
-	 */
-	public ICdtVariable[] getVariables(ILaunchConfiguration launchConfiguration);
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/macros/ILaunchVariableContextInfo.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/macros/ILaunchVariableContextInfo.java
deleted file mode 100755
index 0d19592..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/macros/ILaunchVariableContextInfo.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.macros;
-
-import org.eclipse.cdt.internal.core.cdtvariables.ICoreVariableContextInfo;
-
-/**
- * @author laggarcia
- *
- */
-public interface ILaunchVariableContextInfo extends ICoreVariableContextInfo {
-
-	// The contexts defined by this interface must be consistent with the
-	// contexts defined in @see
-	// org.eclipse.cdt.core.cdtvariables.ICoreVariableContextInfo
-	public final static int CONTEXT_WORKSPACE = 5;
-
-	public final static int CONTEXT_LAUNCH = 9;
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/macros/ILaunchVariableManager.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/macros/ILaunchVariableManager.java
deleted file mode 100755
index c4c0e90..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/macros/ILaunchVariableManager.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.macros;
-
-import org.eclipse.cdt.core.cdtvariables.CdtVariableException;
-
-/**
- * This interface is similar to the one provided by
- * 
- * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider.
- * 
- * @author laggarcia
- * @since 3.0.0
- */
-public interface ILaunchVariableManager {
-
-	public String resolveValue(String value, String nonexistentMacrosValue,
-			String listDelimiter, int contextType, Object contextData)
-			throws CdtVariableException;
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/LaunchPreferences.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/LaunchPreferences.java
deleted file mode 100755
index 272bc9a..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/LaunchPreferences.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.remotetools.environment.launcher.RemoteLauncherPlugin;
-
-public class LaunchPreferences {
-	public static final String PREFIX = "org.eclipse.ptp.remotetools.environment.launcher.preferences-"; //$NON-NLS-1$
-	public static final String ATTR_WORKING_DIRECTORY = PREFIX + "working-directory"; //$NON-NLS-1$
-	
-	public static String DEFAULT_WORKING_DIRECTORY;
-	
-	static {
-		NLS.initializeMessages("org.eclipse.ptp.remotetools.environment.launcher.preferences.launch_preferences", LaunchPreferences.class); //$NON-NLS-1$
-	}
-
-	public static IPreferenceStore getPreferenceStore() {
-		return RemoteLauncherPlugin.getDefault().getPreferenceStore();
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/LauncherPreferencePage.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/LauncherPreferencePage.java
deleted file mode 100755
index 92d3376..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/LauncherPreferencePage.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.preferences;
-
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.StringFieldEditor;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-public class LauncherPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
-
-	IPreferenceStore store;
-	private StringFieldEditor workingDirectory;
-	
-	public LauncherPreferencePage() {
-		super(GRID);
-
-		store = LaunchPreferences.getPreferenceStore();
-		setPreferenceStore(store);
-		
-		setDescription(Messages.LauncherPreferencePage_Description);
-		setTitle(Messages.LauncherPreferencePage_Title);
-	}
-
-
-	protected void createFieldEditors() {
-		workingDirectory = new StringFieldEditor(LaunchPreferences.ATTR_WORKING_DIRECTORY, Messages.LauncherPreferencePage_RemoteWorkingDirectoryLabel, getFieldEditorParent());
-		addField(workingDirectory);
-	}
-
-	public void init(IWorkbench workbench) {
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/Messages.java
deleted file mode 100755
index 815d31d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/Messages.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.preferences;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remotetools.environment.launcher.preferences.messages"; //$NON-NLS-1$
-
-	public static String LauncherPreferencePage_Description;
-
-	public static String LauncherPreferencePage_RemoteWorkingDirectoryLabel;
-
-	public static String LauncherPreferencePage_Title;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/PreferenceInitializer.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/PreferenceInitializer.java
deleted file mode 100755
index d555dde..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/PreferenceInitializer.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ptp.remotetools.environment.launcher.RemoteLauncherPlugin;
-
-public class PreferenceInitializer extends AbstractPreferenceInitializer {
-
-	public PreferenceInitializer() {
-		super();
-	}
-
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = RemoteLauncherPlugin.getDefault().getPreferenceStore();
-		store.setDefault(LaunchPreferences.ATTR_WORKING_DIRECTORY, LaunchPreferences.DEFAULT_WORKING_DIRECTORY);
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/launch_preferences.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/launch_preferences.properties
deleted file mode 100755
index 07f4826..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/launch_preferences.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# 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
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-DEFAULT_WORKING_DIRECTORY=${system_workspace}/${user_workspace}/${project_name}/${timestamp}
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/messages.properties
deleted file mode 100755
index 026d043..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/preferences/messages.properties
+++ /dev/null

@@ -1,13 +0,0 @@
-###############################################################################
-# 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
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-LauncherPreferencePage_Description=Preferences for the Launcher
-LauncherPreferencePage_Title=Remote Tools Application Launcher
-LauncherPreferencePage_RemoteWorkingDirectoryLabel=Remote working directory

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/DownloadRuleDialog.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/DownloadRuleDialog.java
deleted file mode 100755
index 2018eba..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/DownloadRuleDialog.java
+++ /dev/null

@@ -1,490 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.ui;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.ptp.remotetools.environment.launcher.data.DownloadRule;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ISynchronizationRule;
-import org.eclipse.ptp.remotetools.environment.launcher.data.OverwritePolicies;
-import org.eclipse.ptp.utils.ui.swt.ComboGroup;
-import org.eclipse.ptp.utils.ui.swt.ComboMold;
-import org.eclipse.ptp.utils.ui.swt.Frame;
-import org.eclipse.ptp.utils.ui.swt.FrameMold;
-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.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ContainerSelectionDialog;
-
-
-public class DownloadRuleDialog extends TitleAreaDialog implements IRuleDialog {
-
-	Composite content;
-
-	Text localDirectoryText;
-	Button localDirectoryButton;
-	Button localWorkspaceButton;
-
-	List fileList;
-	Button addFilesButton;
-	Button editFileButton;
-	Button removeFilesButton;
-	
-	Button asReadOnlyButton, asExecutableButton;
-	Button preserveTimeStampButton;
-	ComboGroup overwritePolicyCombo;
-	
-	DownloadRule downloadRule;
-	IPath lastSelectedDirectory = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-	
-	private int listenersEnabled = 0;
-	
-	public DownloadRuleDialog(Shell parentShell, DownloadRule rule) {
-		super(parentShell);
-		
-		downloadRule = rule;
-	}
-	
-	public DownloadRuleDialog(Shell shell) {
-		super(shell);
-		downloadRule = new DownloadRule();
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		content = new Composite(parent, SWT.BORDER);
-		GridLayout layout = new GridLayout();
-		content.setLayout(layout);
-//		Layout l = content.getParent().getLayout();
-		content.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL));
-		setTitle(Messages.DownloadRuleDialog_Title);
-		setMessage(Messages.DownloadRuleDialog_Message);
-		
-		createRemoteFilesComposite(content);
-		createLocalDirectoryComposite(content);
-		createOptionsComposite(content);
-		
-		putFieldContents();
-		
-		return content;
-	}
-
-	private void enableListeners() {
-		listenersEnabled ++;		
-	}
-	
-	private void disableListeners() {
-		listenersEnabled--;
-	}
-	
-	private void putFieldContents() {
-		disableListeners();
-		
-		if (downloadRule.getLocalDirectory() != null) {
-			localDirectoryText.setText(downloadRule.getLocalDirectory());
-		} else {
-			localDirectoryText.setText("");			 //$NON-NLS-1$
-		}
-		overwritePolicyCombo.selectIndexUsingID(Integer.toString(downloadRule.getOverwritePolicy()));
-		asExecutableButton.setSelection(downloadRule.isAsExecutable());
-		asReadOnlyButton.setSelection(downloadRule.isAsReadOnly());
-		preserveTimeStampButton.setSelection(downloadRule.isPreserveTimeStamp());
-		String items[] = downloadRule.getRemoteFilesAsStringArray();
-		Arrays.sort(items);
-		fileList.setItems(items);
-		
-		enableListeners();
-	}
-	
-	private void fetchFieldContents() {
-		disableListeners();
-		
-		String path = localDirectoryText.getText().trim();
-		if (path.length() > 0) {
-			downloadRule.setLocalDirectory(path);
-		} else {
-			downloadRule.setLocalDirectory(null);
-		}
-		downloadRule.setOverwritePolicy(Integer.parseInt(overwritePolicyCombo.getSelectionId()));
-		downloadRule.setAsExecutable(asExecutableButton.getSelection());
-		downloadRule.setAsReadOnly(asReadOnlyButton.getSelection());
-		downloadRule.setPreserveTimeStamp(preserveTimeStampButton.getSelection());
-		downloadRule.setRemoteFiles(fileList.getItems());
-		
-		enableListeners();
-	}
-
-	protected void okPressed() {
-		fetchFieldContents();
-		super.okPressed();
-	}
-
-	private Composite createLocalDirectoryComposite(Composite parent) {
-		FrameMold frameMold = new FrameMold();
-		frameMold.setColumns(3);
-		frameMold.setTitle(Messages.DownloadRuleDialog_DestinationFrame_Title);
-		Frame frame = new Frame(parent, frameMold);
-		frame.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		Composite contents = frame.getComposite();
-		
-		GridData localDirectoryGridData = new GridData();
-		localDirectoryGridData.grabExcessHorizontalSpace = true;
-		localDirectoryGridData.horizontalSpan = 3;
-		localDirectoryGridData.horizontalAlignment = SWT.FILL;
-		localDirectoryText = new Text(contents, SWT.SINGLE | SWT.BORDER);
-		localDirectoryText.setLayoutData(localDirectoryGridData);
-		
-		GridData skipperGridData = new GridData();
-		skipperGridData.grabExcessHorizontalSpace = true;
-		skipperGridData.horizontalSpan = 1;
-		skipperGridData.horizontalAlignment = SWT.FILL;
-		Label skipper = new Label(contents, SWT.NONE); // Just to skip one column
-		skipper.setLayoutData(skipperGridData);
-		
-		localDirectoryButton = new Button(contents, SWT.PUSH);
-		localDirectoryButton.setText(Messages.DownloadRuleDialog_DestinationFrame_FileSystemButton);
-		localDirectoryButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				handleLocalDirectoryButtonEvent();
-			}			
-		});
-		localWorkspaceButton = new Button(contents, SWT.PUSH);
-		localWorkspaceButton.setText(Messages.DownloadRuleDialog_DestinationFrame_WorkspaceButton);
-		localWorkspaceButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				handleLocalWorkspaceButtonEvent();
-			}			
-		});
-		
-		return frame;
-	}
-	
-	private Composite createOptionsComposite(Composite parent) {
-		FrameMold frameMold = new FrameMold();
-		frameMold.setColumns(3);
-		frameMold.addOption(FrameMold.COLUMNS_EQUAL_WIDTH);
-		frameMold.setTitle(Messages.DownloadRuleDialog_OptionsFrame_Title);
-		Frame frame = new Frame(parent, frameMold);
-		frame.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		
-		Composite contents = frame.getComposite();
-		asReadOnlyButton = new Button(contents, SWT.CHECK);
-		asReadOnlyButton.setText(Messages.DownloadRuleDialog_OptionsFrame_ReadonlyCheck);
-		asExecutableButton = new Button(contents, SWT.CHECK);
-		asExecutableButton.setText(Messages.DownloadRuleDialog_OptionsFrame_ExecutableCheck);
-		preserveTimeStampButton = new Button(contents, SWT.CHECK);
-		preserveTimeStampButton.setText(Messages.DownloadRuleDialog_OptionsFrame_PreserveTimeStampCheck);
-		
-		ComboMold mold = new ComboMold(ComboMold.GRID_DATA_SPAN);
-		mold.setLabel(Messages.DownloadRuleDialog_OptionsFrame_OverwriteLabel);
-		mold.setTextFieldWidth(40);
-		mold.addItem(Integer.toString(OverwritePolicies.SKIP), Messages.DownloadRuleDialog_OptionsFrame_OverwriteCombo_SkipOption);
-		mold.addItem(Integer.toString(OverwritePolicies.ALWAYS), Messages.DownloadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteAlwaysOption);
-		mold.addItem(Integer.toString(OverwritePolicies.NEWER), Messages.DownloadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteIfNewerOption);
-		overwritePolicyCombo = new ComboGroup(contents, mold);
-		overwritePolicyCombo.getCombo().addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0)
-					return;
-				disableListeners();
-				if (overwritePolicyCombo.getSelectionId().equals(Integer.toString(OverwritePolicies.NEWER))) {
-					preserveTimeStampButton.setEnabled(false);
-					preserveTimeStampButton.setSelection(true);
-				} else {
-					preserveTimeStampButton.setEnabled(true);					
-				}
-				enableListeners();
-			}
-			
-		});
-		return frame;
-	}
-	
-	private Composite createRemoteFilesComposite(Composite parent) {
-		FrameMold frameMold = new FrameMold();
-		frameMold.setColumns(2);
-		frameMold.setTitle(Messages.DownloadRuleDialog_FileListFrame_Title);
-		Frame frame = new Frame(parent, frameMold);
-		frame.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		
-		Frame filesFrame = new Frame(frame.getComposite());
-		fileList = new List(filesFrame, SWT.MULTI | SWT.V_SCROLL);
-		GridData gridData = new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
-		gridData.heightHint=200;
-		fileList.setLayoutData(gridData);
-		fileList.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				removeFilesButton.setEnabled(fileList.getSelectionCount() != 0);
-				editFileButton.setEnabled(fileList.getSelectionCount() == 1);
-			}
-		});
-		fileList.deselectAll();
-		
-		Frame buttonFrame = new Frame(frame.getComposite());
-		addFilesButton = new Button(buttonFrame, SWT.PUSH);
-		addFilesButton.setText(Messages.DownloadRuleDialog_FileListFrame_AddButton);
-		addFilesButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		addFilesButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				handleaddFilesButtonEvent();
-			}			
-		});
-		editFileButton = new Button(buttonFrame, SWT.PUSH);
-		editFileButton.setText(Messages.DownloadRuleDialog_FileListFrame_EditButton);
-		editFileButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		editFileButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				handleEditFileButtonEvent();
-			}			
-		});
-		removeFilesButton = new Button(buttonFrame, SWT.PUSH);
-		removeFilesButton.setText(Messages.DownloadRuleDialog_FileListFrame_RemoveButton);
-		removeFilesButton.setEnabled(false);
-		removeFilesButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		removeFilesButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				handleRemoveFilesButtonEvent();
-			}
-			
-		});
-		GridData gridData2 = new GridData();
-		gridData2.grabExcessVerticalSpace = true;
-		gridData2.verticalAlignment = SWT.TOP;
-		buttonFrame.setLayoutData(gridData2);
-		
-		return frame;
-	}
-
-	
-	private void handleLocalDirectoryButtonEvent() {
-		if (listenersEnabled < 0) return;
-
-		IPath selectedPath = null;
-		/*
-		 * First, try the current path.
-		 */
-		IPath workspacePath = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-		IPath currentPath = new Path(localDirectoryText.getText());
-		if (! currentPath.isAbsolute()) {
-			currentPath = workspacePath.append(currentPath).removeTrailingSeparator();
-		}
-		File file = new File(currentPath.toOSString());
-		if (file.isDirectory() && file.isDirectory()) {
-			selectedPath =  currentPath;
-		}
-		
-		/*
-		 * If not, try last directory.
-		 */
-		if (selectedPath == null) {
-			File file2 = new File(lastSelectedDirectory.toOSString());
-			if (file2.isDirectory() && file2.isDirectory()) {
-				selectedPath =  lastSelectedDirectory;
-			}
-		}
-		
-		/*
-		 * Otherwise, use workspace root.
-		 */
-		if (selectedPath == null) {
-			selectedPath = workspacePath;
-		}
-		
-		DirectoryDialog directoryDialog = new DirectoryDialog(getShell(), SWT.OPEN);
-		directoryDialog.setFilterPath(selectedPath.toOSString());
-		directoryDialog.setText(Messages.DownloadRuleDialog_DirectoryDialog_Title);
-		directoryDialog.setMessage(Messages.DownloadRuleDialog_DirectoryDialog_Message);
-
-		String newPath = directoryDialog.open();
-
-		if (newPath != null) {			
-			/*
-			 * If path is inside the workspace, then make it relative.
-			 */
-			IPath workspace = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-			IPath path = new Path(newPath);
-			if (workspace.isPrefixOf(path)) {
-				path = path.removeFirstSegments(workspace.segmentCount());
-				path = path.makeRelative();
-			}
-			localDirectoryText.setText(path.toOSString());
-			
-			/*
-			 * Save lastSelectedDirectory. There is a bug in DirectoryDialog.
-			 * The method getFilterPath does not return the expected path.
-			 * The bug will be fixed in Eclipse 3.4.
-			 * The workarount takes the parent of the selected directory as lastSelectedDirectory.
-			 */
-			lastSelectedDirectory = new Path(newPath);
-			lastSelectedDirectory = lastSelectedDirectory.removeLastSegments(1).removeTrailingSeparator();
-		}
-	}
-	
-	private void handleLocalWorkspaceButtonEvent() {
-		IWorkspaceRoot workspace = ResourcesPlugin.getWorkspace().getRoot();
-		IContainer selectedContainer = null;
-	
-		/*
-		 * First, try the current content as initial selection.
-		 */
-		IPath currentPath = new Path(localDirectoryText.getText());
-		if (currentPath.isAbsolute()) {
-			// Absolute path if file system
-			IContainer currentContainer[] = workspace.findContainersForLocation(currentPath);
-			if (currentContainer != null) {
-				if (currentContainer.length == 1) {
-					selectedContainer = currentContainer[0];
-				}
-			}
-		} else {
-			// Path relative to workspace
-			IResource selectedResource = workspace.findMember(lastSelectedDirectory);
-			if (selectedResource != null) {
-				if (selectedResource instanceof IContainer) {
-					selectedContainer = (IContainer) selectedResource;
-				}
-			}
-		}
-		
-		/*
-		 * Otherwise, try the last selected path as initial selection.
-		 */
-		if (selectedContainer == null) {
-			IContainer lastContainer[] = workspace.findContainersForLocation(lastSelectedDirectory);
-			if (lastContainer != null) {
-				if (lastContainer.length == 1) {
-					selectedContainer = lastContainer[0];
-				}
-			}
-		}
-				
-		/*
-		 * If nothing matches, use the workspace root.
-		 */
-		if (selectedContainer == null) {
-			selectedContainer = workspace;
-		}
-		
-		ContainerSelectionDialog dialog = new ContainerSelectionDialog(getShell(), workspace, true, Messages.DownloadRuleDialog_WorkspaceDialog_Title);
-		dialog.setBlockOnOpen(true);
-		dialog.setInitialSelections(new Object[] { selectedContainer });
-		
-		if (dialog.open() == Dialog.OK) {
-			/*
-			 * Although not documented, getResult returns an array with exactly
-			 * one element, that has type of IPath.
-			 * The path is relative to workspace.
-			 */
-			Object r[] = dialog.getResult();
-			IPath selectedPath = (IPath)r[0];
-			// The path is returned as absolute! Make it relative!
-			localDirectoryText.setText(selectedPath.makeRelative().toOSString());
-			
-			lastSelectedDirectory = selectedPath.removeLastSegments(1).removeTrailingSeparator();
-		}
-	}
-
-	private void handleaddFilesButtonEvent() {
-		InputDialog inputDialog = new InputDialog(getShell(), Messages.DownloadRuleDialog_AddFileDialog_Title, Messages.DownloadRuleDialog_AddFileDialog_Message, "", null); //$NON-NLS-3$ //$NON-NLS-1$ //$NON-NLS-1$
-		inputDialog.setBlockOnOpen(true);
-		if (inputDialog.open() == Dialog.OK) {
-			ArrayList list = new ArrayList(Arrays.asList(fileList.getItems()));
-			list.add(inputDialog.getValue());
-			String s[] = new String[list.size()];
-			s = (String[]) list.toArray(s);
-			Arrays.sort(s);
-			fileList.setItems(s);
-		}
-	}
-	
-	private void handleEditFileButtonEvent() {
-		if (fileList.getSelectionCount() != 1) {
-			return;
-		}
-		int index = fileList.getSelectionIndex();
-		String selectedItem = fileList.getItem(index);
-		
-		InputDialog inputDialog = new InputDialog(getShell(), Messages.DownloadRuleDialog_EditFileDialog_Title, Messages.DownloadRuleDialog_EditFileDialog_Message, selectedItem, null);
-		inputDialog.setBlockOnOpen(true);
-		if (inputDialog.open() == Dialog.OK) {
-			String s[] = fileList.getItems();
-			s[index] = inputDialog.getValue();
-			Arrays.sort(s);
-			fileList.setItems(s);
-		}
-	}
-	
-	private void handleRemoveFilesButtonEvent() {
-		String selection [] = fileList.getSelection();
-		if (selection.length == 0) {
-			return;
-		}
-		
-		HashSet fileSet = new HashSet(Arrays.asList(fileList.getItems()));
-		for (int i = 0; i < selection.length; i++) {
-			String string = selection[i];
-			fileSet.remove(string);
-		}
-		
-		String items[] = new String[fileSet.size()];
-		items = (String[]) fileSet.toArray(items);
-		Arrays.sort(items);
-		fileList.setItems(items);
-	}
-
-	public ISynchronizationRule getRuleWorkingCopy() {
-		return downloadRule;
-	}
-}
-

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/EnhancedSynchronizeTab.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/EnhancedSynchronizeTab.java
deleted file mode 100755
index 21f45c5..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/EnhancedSynchronizeTab.java
+++ /dev/null

@@ -1,439 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.launcher.ui;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-
-import org.eclipse.cdt.launch.internal.ui.LaunchMessages;
-import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ptp.remotetools.environment.launcher.RemoteLauncherPlugin;
-import org.eclipse.ptp.remotetools.environment.launcher.core.IRemoteLaunchAttributes;
-import org.eclipse.ptp.remotetools.environment.launcher.data.DownloadRule;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ISynchronizationRule;
-import org.eclipse.ptp.remotetools.environment.launcher.data.OverwritePolicies;
-import org.eclipse.ptp.remotetools.environment.launcher.data.RuleFactory;
-import org.eclipse.ptp.remotetools.environment.launcher.data.UploadRule;
-import org.eclipse.ptp.remotetools.environment.launcher.preferences.LaunchPreferences;
-import org.eclipse.ptp.utils.ui.swt.Frame;
-import org.eclipse.ptp.utils.ui.swt.FrameMold;
-import org.eclipse.swt.SWT;
-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.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-
-
-/**
- * 
- * @author Daniel Felix Ferber
- * @since 1.1
- */
-public class EnhancedSynchronizeTab extends AbstractLaunchConfigurationTab {
-
-	protected Button addUploadRuleButton;
-	protected Button addDownloadRuleButton;
-	protected Button editRuleButton;
-	protected Button removeRuleButton;
-	protected List ruleList;
-	protected ListViewer ruleViewer;
-	
-	protected Button syncBeforeButton;
-	protected Button syncAfterButton;
-	
-	protected ArrayList rules = new ArrayList();
-	protected SynchronizationRuleLabelProvider ruleLabelProvider;
-
-	boolean dataChanged = false;
-	int eventHandlerEnabled = 0;
-	
-	Image tabImage;
-	
-	public EnhancedSynchronizeTab() {
-		super();
-		dataChanged = false;
-		URL url = RemoteLauncherPlugin.getDefault().getBundle().getEntry("/icons/sync.png"); //$NON-NLS-1$
-		if (url != null) {
-		    ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(url);
-		    tabImage = imageDescriptor.createImage();
-		}
-	}
-
-	protected void enableEventHandlers() {
-		eventHandlerEnabled++;
-	}
-	
-	protected void disableEventHandlers() {
-		eventHandlerEnabled--;
-	}
-	
-	protected boolean isEventHandlerEnabled() {
-		return eventHandlerEnabled > 0;
-	}
-
-	protected class TabModifyListener implements ModifyListener, SelectionListener {
-		public void modifyText(ModifyEvent e) {
-			if (! isEventHandlerEnabled()) return;
-			dataChanged = true;
-			updateLaunchConfigurationDialog();
-		}
-
-		public void widgetDefaultSelected(SelectionEvent e) {
-			if (! isEventHandlerEnabled()) return;
-			dataChanged = true;
-			updateLaunchConfigurationDialog();
-		}
-
-		public void widgetSelected(SelectionEvent e) {
-			if (! isEventHandlerEnabled()) return;
-			dataChanged = true;
-			updateLaunchConfigurationDialog();
-		}
-	}
-
-	protected TabModifyListener modifyListener;
-
-	public void createControl(Composite parent) {
-
-		this.setErrorMessage(null);
-		this.setMessage(Messages.EnhancedSynchronizeTab_Tab_Message);
-
-		Composite topControl = new Composite(parent, SWT.NONE);
-		GridLayout topLayout = new GridLayout();
-		topControl.setLayout(topLayout);
-
-		setControl(topControl);
-		
-		Frame frame = new Frame(topControl, Messages.EnhancedSynchronizeTab_RulesFrame_Title);
-		frame.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL | GridData.FILL_VERTICAL | GridData.GRAB_VERTICAL));
-		Composite frameComposite = frame.getComposite();
-
-		modifyListener = new TabModifyListener();
-
-		createRuleListControl(frameComposite);
-		createOptionsControl(frameComposite);
-		createButtonControl(frameComposite);
-		
-		enableEventHandlers();
-		
-	}
-
-	protected Composite createRuleListControl(Composite parent) {
-		Frame frame = new Frame(parent, 1);
-		frame.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL));
-		Composite frameComposite = frame.getComposite();
-		
-		Label label = new Label(frameComposite, SWT.WRAP);
-		label.setText(Messages.EnhancedSynchronizeTab_RulesFrame_Description);
-		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		ruleList = new List(frameComposite, SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL);
-		GridData gridData = new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
-		gridData.heightHint=100;
-		ruleList.setLayoutData(gridData);
-		ruleList.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (! isEventHandlerEnabled()) return;
-				removeRuleButton.setEnabled(ruleList.getSelectionCount() != 0);
-				editRuleButton.setEnabled(ruleList.getSelectionCount() == 1);
-			}
-		});
-		ruleList.deselectAll();
-		ruleViewer = new ListViewer(ruleList);
-		ruleViewer.setContentProvider(new IStructuredContentProvider() {
-			public Object[] getElements(Object inputElement) {
-				return rules.toArray();
-			}
-
-			public void dispose() {
-			}
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-//				System.out.println(oldInput.toString());
-			}
-		});
-		
-		ruleLabelProvider = new SynchronizationRuleLabelProvider();
-		ruleViewer.setLabelProvider(ruleLabelProvider);
-		ruleViewer.setInput(rules);
-		return frame;		
-	}
-
-	protected Composite createOptionsControl(Composite parent) {
-		Frame frame = new Frame(parent, FrameMold.COLUMNS_EQUAL_WIDTH, 2);
-		Composite frameComposite = frame.getComposite();
-		
-		syncBeforeButton = createCheckButton(frameComposite, Messages.EnhancedSynchronizeTab_RulesFrame_Options_UploadEnabled);
-		syncBeforeButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		syncBeforeButton.addSelectionListener(modifyListener);
-		syncAfterButton = createCheckButton(frameComposite, Messages.EnhancedSynchronizeTab_RulesFrame_Options_DownloadEnabled);
-		syncAfterButton.addSelectionListener(modifyListener);
-		syncAfterButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		
-		return frame;
-	}
-	
-	protected Composite createButtonControl(Composite parent) {
-		Frame frame = new Frame(parent, FrameMold.COLUMNS_EQUAL_WIDTH, 4);
-		Composite frameComposite = frame.getComposite();
-		
-		addUploadRuleButton = new Button(frameComposite, SWT.PUSH);
-		addUploadRuleButton.setText(Messages.EnhancedSynchronizeTab_RulesFrame_Actions_NewUploadRule);
-		addUploadRuleButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		addUploadRuleButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (! isEventHandlerEnabled()) return;
-				handleAddUploadRuleButtonPressed();
-			}
-		});
-		
-		addDownloadRuleButton = new Button(frameComposite, SWT.PUSH);
-		addDownloadRuleButton.setText(Messages.EnhancedSynchronizeTab_RulesFrame_Actions_DownloadRule);
-		addDownloadRuleButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		addDownloadRuleButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (! isEventHandlerEnabled()) return;
-				handleAddDownloadRuleButtonPressed();
-			}
-		});
-
-		editRuleButton = new Button(frameComposite, SWT.PUSH);
-		editRuleButton.setText(Messages.EnhancedSynchronizeTab_RulesFrame_Actions_EditSelectedRule);
-		editRuleButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		editRuleButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (! isEventHandlerEnabled()) return;
-				handleEditRuleButtonPressed();
-			}
-		});
-		editRuleButton.setEnabled(false);
-		
-		removeRuleButton = new Button(frameComposite, SWT.PUSH);
-		removeRuleButton.setText(Messages.EnhancedSynchronizeTab_RulesFrame_Actions_RemoveSelectedRules);
-		removeRuleButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		removeRuleButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (! isEventHandlerEnabled()) return;
-				handleRemoveRuleButtonPressed();
-			}
-		});
-		removeRuleButton.setEnabled(false);
-
-		return frame;
-	}
-	
-
-	public boolean isValid(ILaunchConfiguration config) {
-		return super.isValid(config);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#canSave()
-	 */
-	public boolean canSave() {
-		return super.canSave() || dataChanged;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute(IRemoteLaunchAttributes.ATTR_SYNC_AFTER,
-				IRemoteLaunchAttributes.DEFAULT_SYNC_AFTER);
-		configuration.setAttribute(IRemoteLaunchAttributes.ATTR_SYNC_BEFORE,
-				IRemoteLaunchAttributes.DEFAULT_SYNC_BEFORE);
-		configuration.setAttribute(IRemoteLaunchAttributes.ATTR_SYNC_RULES, new ArrayList());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		dataChanged = false;
-		try {
-			syncAfterButton.setSelection(configuration.getAttribute(
-					IRemoteLaunchAttributes.ATTR_SYNC_AFTER,
-					IRemoteLaunchAttributes.DEFAULT_SYNC_AFTER));
-			syncBeforeButton.setSelection(configuration.getAttribute(
-					IRemoteLaunchAttributes.ATTR_SYNC_BEFORE,
-					IRemoteLaunchAttributes.DEFAULT_SYNC_BEFORE));
-			java.util.List list = configuration.getAttribute(
-					IRemoteLaunchAttributes.ATTR_SYNC_RULES,
-					new ArrayList());
-			rules.clear();
-			for (Iterator iter = list.iterator(); iter.hasNext();) {
-				String string = (String) iter.next();
-				ISynchronizationRule rule = RuleFactory.createRuleFromString(string);
-				rules.add(rule);
-			}
-
-//			RemoteLaunchDelegate delegate = new RemoteLaunchDelegate();
-//			ruleLabelProvider.setRemoteWorkingDir(LinuxPath.toString(delegate.getValidatedRemoteDirectory(configuration)));
-//			ruleLabelProvider.setRemoteWorkingDir(LinuxPath.toString(delegate.getRemoteDirectory(configuration)));
-			
-			String defaultRemoteWorkingDirectory = LaunchPreferences.getPreferenceStore().getString(
-					LaunchPreferences.ATTR_WORKING_DIRECTORY);
-			
-			if( configuration.getAttribute(IRemoteLaunchAttributes.ATTR_AUTOMATIC_WORKING_DIRECTORY, IRemoteLaunchAttributes.DEFAULT_AUTOMATIC_WORKING_DIRECTORY)){
-				ruleLabelProvider.setRemoteWorkingDir( defaultRemoteWorkingDirectory );
-			} else {
-				ruleLabelProvider.setRemoteWorkingDir( configuration.getAttribute(IRemoteLaunchAttributes.ATTR_REMOTE_DIRECTORY, defaultRemoteWorkingDirectory) );
-			}
-			
-			refreshRuleList();
-		} catch (CoreException e) {
-			setErrorMessage(LaunchMessages
-					.getFormattedString(
-							"Launch.common.Exception_occurred_reading_configuration_EXCEPTION", e.getStatus().getMessage())); //$NON-NLS-1$
-			LaunchUIPlugin.log(e);
-		}
-	}
-
-	private void refreshRuleList() {
-//		ruleList.removeAll();
-//		for (Iterator iter = rules.iterator(); iter.hasNext();) {
-//			ISynchronizationRule rule = (ISynchronizationRule) iter.next();
-//			ruleList.add(rule.toLabel());
-//		}
-//		IStructuredSelection selection = (IStructuredSelection) ruleViewer.getSelection();
-//		Object firstElement = selection.getFirstElement();
-		ruleViewer.refresh();
-//		if (firstElement != null) {
-//			selection = new StructuredSelection(new Object[] {firstElement});
-//			ruleViewer.setSelection(selection, true);
-//		}
-	}
-	
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute(IRemoteLaunchAttributes.ATTR_SYNC_AFTER, syncAfterButton.getSelection());
-		configuration.setAttribute(IRemoteLaunchAttributes.ATTR_SYNC_BEFORE, syncBeforeButton.getSelection());
-		ArrayList list = new ArrayList();
-		for (Iterator iter = rules.iterator(); iter.hasNext();) {
-			ISynchronizationRule rule = (ISynchronizationRule) iter.next();
-			list.add(rule.toString());
-		}
-		configuration.setAttribute(IRemoteLaunchAttributes.ATTR_SYNC_RULES, list);
-		dataChanged = false;
-	}
-
-	public String getName() {
-		return Messages.EnhancedSynchronizeTab_Tab_Title;
-	}
-
-	public Image getImage() {
-		return tabImage;
-	}
-
-	protected void handleAddUploadRuleButtonPressed() {
-		UploadRule uploadRule = new UploadRule();
-		uploadRule.setDefaultRemoteDirectory(true);
-		uploadRule.setRemoteDirectory(null);
-		uploadRule.setOverwritePolicy(OverwritePolicies.ALWAYS);
-		newRuleDialog(uploadRule);
-	}
-	
-	protected void handleAddDownloadRuleButtonPressed() {
-		DownloadRule downloadRule = new DownloadRule();
-		downloadRule.setOverwritePolicy(OverwritePolicies.ALWAYS);
-		newRuleDialog(downloadRule);
-	}
-	
-	protected void newRuleDialog(ISynchronizationRule rule) {
-		Dialog dialog = RuleDialogFactory.createDialogForRule(getShell(), rule);
-		if (dialog != null) {
-			if (dialog.open() == Dialog.OK) {
-				IRuleDialog ruleDialog = (IRuleDialog) dialog;
-				ISynchronizationRule newRule = RuleFactory.duplicateRule(ruleDialog.getRuleWorkingCopy());
-				rules.add(newRule);
-			}
-		} else {
-			MessageDialog.openError(getShell(), Messages.EnhancedSynchronizeTab_ErrorMessage_NewRule_Title,	Messages.EnhancedSynchronizeTab_ErrorMessage_NewRule_DontKnowRuleType);
-		}
-		refreshRuleList();
-		dataChanged = true;
-		updateLaunchConfigurationDialog();
-	}
-
-	protected void handleEditRuleButtonPressed() {
-		if (ruleList.getSelectionCount() != 1) return;
-		
-		int index = ruleList.getSelectionIndex();
-		ISynchronizationRule rule = (ISynchronizationRule) rules.get(index);
-		Dialog dialog = RuleDialogFactory.createDialogForRule(getShell(), rule);
-		if (dialog != null) {
-			if (dialog.open() == Dialog.OK) {
-				IRuleDialog ruleDialog = (IRuleDialog) dialog;
-				ISynchronizationRule newRule = RuleFactory.duplicateRule(ruleDialog.getRuleWorkingCopy());
-				rules.set(index, newRule);
-			}
-		} else {
-			MessageDialog.openError(getShell(), Messages.EnhancedSynchronizeTab_ErrorMessage_NewRule_Title,	Messages.EnhancedSynchronizeTab_ErrorMessage_NewRule_DontKnowRuleType);
-		}
-		refreshRuleList();
-		dataChanged = true;
-		updateLaunchConfigurationDialog();
-	}
-	
-	protected void handleRemoveRuleButtonPressed() {		
-		if (ruleList.getSelectionCount() == 0) return;
-
-		int indexes[] = ruleList.getSelectionIndices();
-		HashSet set = new HashSet();
-		for (int i = 0; i < indexes.length; i++) {
-			int index = indexes[i];
-			set.add(rules.get(index));
-		}
-		rules.removeAll(set);
-		refreshRuleList();
-		dataChanged = true;
-		updateLaunchConfigurationDialog();
-	}
-	
-	public void dispose() {
-		super.dispose();
-
-		if (tabImage != null) tabImage.dispose();
-		tabImage = null;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/IRuleDialog.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/IRuleDialog.java
deleted file mode 100755
index 7c13d14..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/IRuleDialog.java
+++ /dev/null

@@ -1,18 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.ui;
-
-import org.eclipse.ptp.remotetools.environment.launcher.data.ISynchronizationRule;
-
-public interface IRuleDialog {
-	public ISynchronizationRule getRuleWorkingCopy();
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/LauncherExecutionTab.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/LauncherExecutionTab.java
deleted file mode 100755
index 5c539e9..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/LauncherExecutionTab.java
+++ /dev/null

@@ -1,274 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.launcher.ui;
-
-import java.util.ArrayList;
-
-import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
-import org.eclipse.cdt.launch.internal.ui.LaunchMessages;
-import org.eclipse.cdt.launch.internal.ui.LaunchUIPlugin;
-import org.eclipse.cdt.launch.ui.CLaunchConfigurationTab;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.ptp.remotetools.environment.launcher.RemoteLauncherPlugin;
-import org.eclipse.ptp.remotetools.environment.launcher.core.IRemoteLaunchAttributes;
-import org.eclipse.ptp.remotetools.environment.launcher.internal.LaunchObserverIterator;
-import org.eclipse.ptp.utils.ui.swt.ToolKit;
-import org.eclipse.swt.SWT;
-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.Image;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Text;
-
-
-public class LauncherExecutionTab extends CLaunchConfigurationTab {
-
-	protected Text programArgumentsText;
-
-	private Combo observerList;
-	private ArrayList observerIDs;
-	private Text beforeCommandText;
-	private Text afterCommandText;
-	
-	private boolean isValid;
-	
-	private class TabModifyListener implements ModifyListener, SelectionListener {
-		public void modifyText(ModifyEvent e) {
-			verifyContent();
-			updateLaunchConfigurationDialog();
-		}
-
-		public void widgetDefaultSelected(SelectionEvent e) {
-			verifyContent();
-			updateLaunchConfigurationDialog();
-		}
-
-		public void widgetSelected(SelectionEvent e) {
-			verifyContent();
-			updateLaunchConfigurationDialog();
-		}
-	}
-	private TabModifyListener modifyListener;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-
-		this.setErrorMessage(null);
-
-		GridLayout topLayout = new GridLayout();
-		Composite topControl = new Composite(parent, SWT.NONE);
-		topControl.setLayout(topLayout);
-
-		setControl(topControl);
-		
-		//LaunchUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(getControl(), ICDTLaunchHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_ARGUMNETS_TAB);
-
-		modifyListener = new TabModifyListener();
-
-		createArgumentGroup(topControl);
-		createTargetObserverGroup(topControl);
-		
-		verifyContent();
-	}
-
-	protected void createArgumentGroup(Composite comp) {
-		Group group = ToolKit.createGroup(comp, Messages.LauncherExecutionTab_ArgumentsFrame_Title);
-
-		programArgumentsText = ToolKit.createTextRow(group, Messages.LauncherExecutionTab_ArgumentsFrame_CommandLineLabel, null);
-		programArgumentsText.addModifyListener(modifyListener);
-	}	
-
-	protected void createTargetObserverGroup(Composite topControl) {
-		Group group = ToolKit.createGroup(topControl, Messages.LauncherExecutionTab_ObserverFrame_Title);
-
-		observerList = ToolKit.createShortDropDownRow(group, Messages.LauncherExecutionTab_ObserverFrame_ParserLabel);
-		observerList.addSelectionListener(modifyListener);
-		
-		beforeCommandText = ToolKit.createTextRow(group, Messages.LauncherExecutionTab_ObserverFrame_BashCommandsBeforeLAbel, null, 4);
-		beforeCommandText.addModifyListener(modifyListener);
-		
-		afterCommandText = ToolKit.createTextRow(group, Messages.LauncherExecutionTab_ObserverFrame_BashCommandsAfterLabel, null, 4);
-		afterCommandText.addModifyListener(modifyListener);
-	}
-
-	protected void verifyContent() {
-		isValid = true;
-		setErrorMessage(null);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public boolean isValid(ILaunchConfiguration config) {
-		/*
-		 * If a observer is selected, then the DebugPlugin.ATTR_CAPTURE_OUTPUT attribute must be true.
-		 */
-		int selection = observerList.getSelectionIndex();
-		if (selection == -1) {
-			selection = 0;
-		}
-		String selectedObserverID = (String)observerIDs.get(selection);
-		if (selectedObserverID != null) {
-			try {
-				if (! config.getAttribute(DebugPlugin.ATTR_CAPTURE_OUTPUT, false)) {
-					isValid = false;
-					setMessage(Messages.LauncherExecutionTab_Validation_ObserverAndNoConsole);
-				}
-			} catch (CoreException e) {
-				// Nothing
-			}
-		}
-		
-		return super.isValid(config) && isValid;
-	}
-	
-	/* (non-Javadoc)
-	 * @see ILaunchConfigurationTab#canSave()
-	 */
-	public boolean canSave() {
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, (String) null);
-
-		configuration.setAttribute(IRemoteLaunchAttributes.ATTR_AFTER_COMMAND, IRemoteLaunchAttributes.DEFAULT_AFTER_COMMAND);
-		configuration.setAttribute(IRemoteLaunchAttributes.ATTR_BEFORE_COMMAND, IRemoteLaunchAttributes.DEFAULT_BEFORE_COMMAND);
-		configuration.setAttribute(IRemoteLaunchAttributes.ATTR_OUTPUT_OBSERVER, IRemoteLaunchAttributes.DEFAULT_OUTPUT_OBSERVER);
-		configuration.setAttribute(IRemoteLaunchAttributes.ATTR_USE_FORWARDED_X11, IRemoteLaunchAttributes.DEFAULT_USE_FORWARDED_X11);
-}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public void initializeFrom(ILaunchConfiguration configuration) {
-		try {
-			programArgumentsText.setText(configuration.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, "")); //$NON-NLS-1$
-			
-			/*
-			 * Generate list of all observer plug-ins 
-			 */
-			observerList.removeAll();
-			String current;
-			int selected;
-			try {
-				current = configuration.getAttribute(IRemoteLaunchAttributes.ATTR_OUTPUT_OBSERVER, ""); //$NON-NLS-1$
-			} catch (CoreException e) {
-				current = ""; //$NON-NLS-1$
-			}
-			selected = 0;
-			observerList.add(Messages.LauncherExecutionTab_ObserverFrame_ObserverCombo_DefaultNoneOption);
-			observerIDs = new ArrayList();
-			observerIDs.add(null);
-			LaunchObserverIterator iterator = RemoteLauncherPlugin.getLaunchObserverIterator();
-			int index = 0;
-			while (iterator.hasMoreElements()) {
-				iterator.nextElement();
-				String name = iterator.getName();
-				String id = iterator.getID();
-				if (name == null) continue;
-				if (id == null) continue;
-				observerList.add(name);
-				if (current.equals(id)) {
-					selected = index;
-				}
-				observerIDs.add(id);
-				index++;
-			}
-			observerList.select(selected);
-			
-			/*
-			 * Fill bash command fields
-			 */
-			try {
-				beforeCommandText.setText(configuration.getAttribute(IRemoteLaunchAttributes.ATTR_BEFORE_COMMAND, "")); //$NON-NLS-1$
-			} catch (CoreException e) {
-				beforeCommandText.setText(null);
-			}
-			try {
-				afterCommandText.setText(configuration.getAttribute(IRemoteLaunchAttributes.ATTR_AFTER_COMMAND, "")); //$NON-NLS-1$
-			} catch (CoreException e) {
-				afterCommandText.setText(null);
-			}
-
-			verifyContent();	
-		}
-		catch (CoreException e) {
-			setErrorMessage(LaunchMessages.getFormattedString("Launch.common.Exception_occurred_reading_configuration_EXCEPTION", e.getStatus().getMessage())); //$NON-NLS-1$
-			LaunchUIPlugin.log(e);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
-	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
-		configuration.setAttribute(
-			ICDTLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS,
-			getAttributeValueFrom(programArgumentsText));
-
-		/*
-		 * Observer
-		 */
-		int selection = observerList.getSelectionIndex();
-		if (selection == -1) {
-			selection = 0;
-		}
-		configuration.setAttribute(IRemoteLaunchAttributes.ATTR_OUTPUT_OBSERVER, (String)observerIDs.get(selection));
-		
-		/*
-		 * Bash command fields
-		 */
-		configuration.setAttribute(IRemoteLaunchAttributes.ATTR_BEFORE_COMMAND, beforeCommandText.getText());
-		configuration.setAttribute(IRemoteLaunchAttributes.ATTR_AFTER_COMMAND, afterCommandText.getText());
-	}
-
-	/**
-	 * Returns the string in the text widget, or <code>null</code> if empty.
-	 * 
-	 * @return text or <code>null</code>
-	 */
-	protected String getAttributeValueFrom(Text text) {
-		String content = text.getText().trim();
-		if (content.length() > 0) {
-			return content;
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
-	 */
-	public String getName() {
-		return Messages.LauncherExecutionTab_Tab_Title;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage()
-	 */
-	public Image getImage() {
-		return null;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/Messages.java
deleted file mode 100755
index 630bf97..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/Messages.java
+++ /dev/null

@@ -1,219 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remotetools.environment.launcher.ui.messages"; //$NON-NLS-1$
-
-	public static String LauncherExecutionTab_ArgumentsFrame_CommandLineLabel;
-
-	public static String LauncherExecutionTab_ArgumentsFrame_Title;
-
-	public static String LauncherExecutionTab_ObserverFrame_BashCommandsAfterLabel;
-
-	public static String LauncherExecutionTab_ObserverFrame_BashCommandsBeforeLAbel;
-
-	public static String LauncherExecutionTab_ObserverFrame_ObserverCombo_DefaultNoneOption;
-
-	public static String LauncherExecutionTab_ObserverFrame_ParserLabel;
-
-	public static String LauncherExecutionTab_ObserverFrame_Title;
-
-	public static String LauncherExecutionTab_Tab_Title;
-
-	public static String LauncherExecutionTab_Validation_ObserverAndNoConsole;
-
-	public static String DownloadRuleDialog_AddFileDialog_Message;
-
-	public static String DownloadRuleDialog_AddFileDialog_Title;
-
-	public static String DownloadRuleDialog_DestinationFrame_FileSystemButton;
-
-	public static String DownloadRuleDialog_DestinationFrame_Title;
-
-	public static String DownloadRuleDialog_DestinationFrame_WorkspaceButton;
-
-	public static String DownloadRuleDialog_DirectoryDialog_Message;
-
-	public static String DownloadRuleDialog_DirectoryDialog_Title;
-
-	public static String DownloadRuleDialog_EditFileDialog_Message;
-
-	public static String DownloadRuleDialog_EditFileDialog_Title;
-
-	public static String DownloadRuleDialog_FileListFrame_AddButton;
-
-	public static String DownloadRuleDialog_FileListFrame_EditButton;
-
-	public static String DownloadRuleDialog_FileListFrame_RemoveButton;
-
-	public static String DownloadRuleDialog_FileListFrame_Title;
-
-	public static String DownloadRuleDialog_Message;
-
-	public static String DownloadRuleDialog_OptionsFrame_ExecutableCheck;
-
-	public static String DownloadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteAlwaysOption;
-
-	public static String DownloadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteIfNewerOption;
-
-	public static String DownloadRuleDialog_OptionsFrame_OverwriteCombo_SkipOption;
-
-	public static String DownloadRuleDialog_OptionsFrame_OverwriteLabel;
-
-	public static String DownloadRuleDialog_OptionsFrame_PreserveTimeStampCheck;
-
-	public static String DownloadRuleDialog_OptionsFrame_ReadonlyCheck;
-
-	public static String DownloadRuleDialog_OptionsFrame_Title;
-
-	public static String DownloadRuleDialog_Title;
-
-	public static String DownloadRuleDialog_WorkspaceDialog_Title;
-
-	public static String EnhancedSynchronizeTab_DownloadLabel_DestinationLabel;
-
-	public static String EnhancedSynchronizeTab_DownloadLabel_DestinationMissing;
-
-	public static String EnhancedSynchronizeTab_DownloadLabel_FileListSeparator;
-
-	public static String EnhancedSynchronizeTab_DownloadLabel_FromLabel;
-
-	public static String EnhancedSynchronizeTab_DownloadLabel_MultipleFiles;
-
-	public static String EnhancedSynchronizeTab_DownloadLabel_NoFiles;
-
-	public static String EnhancedSynchronizeTab_DownloadLabel_OneFile;
-
-	public static String EnhancedSynchronizeTab_DownloadLabel_Options_Executable;
-
-	public static String EnhancedSynchronizeTab_DownloadLabel_Options_PreserveTimeStamp;
-
-	public static String EnhancedSynchronizeTab_DownloadLabel_Options_Readonly;
-
-	public static String EnhancedSynchronizeTab_DownloadLabel_OptionsLabel;
-
-	public static String EnhancedSynchronizeTab_DownloadLabel_OptionsSeparator;
-
-	public static String EnhancedSynchronizeTab_DownloadLabel_Type;
-
-	public static String EnhancedSynchronizeTab_ErrorMessage_NewRule_DontKnowRuleType;
-
-	public static String EnhancedSynchronizeTab_ErrorMessage_NewRule_Title;
-
-	public static String EnhancedSynchronizeTab_RulesFrame_Actions_DownloadRule;
-
-	public static String EnhancedSynchronizeTab_RulesFrame_Actions_EditSelectedRule;
-
-	public static String EnhancedSynchronizeTab_RulesFrame_Actions_NewUploadRule;
-
-	public static String EnhancedSynchronizeTab_RulesFrame_Actions_RemoveSelectedRules;
-
-	public static String EnhancedSynchronizeTab_RulesFrame_Description;
-
-	public static String EnhancedSynchronizeTab_RulesFrame_Options_DownloadEnabled;
-
-	public static String EnhancedSynchronizeTab_RulesFrame_Options_UploadEnabled;
-
-	public static String EnhancedSynchronizeTab_RulesFrame_Title;
-
-	public static String EnhancedSynchronizeTab_Tab_Message;
-
-	public static String EnhancedSynchronizeTab_Tab_Title;
-
-	public static String EnhancedSynchronizeTab_UploadLabel_DestinationLabel;
-
-	public static String EnhancedSynchronizeTab_UploadLabel_DestinationSeparator;
-
-	public static String EnhancedSynchronizeTab_UploadLabel_FileListSeparator;
-
-	public static String EnhancedSynchronizeTab_UploadLabel_FromLabel;
-
-	public static String EnhancedSynchronizeTab_UploadLabel_MultipleFiles;
-
-	public static String EnhancedSynchronizeTab_UploadLabel_NoFiles;
-
-	public static String EnhancedSynchronizeTab_UploadLabel_OneFile;
-
-	public static String EnhancedSynchronizeTab_UploadLabel_Options_DownloadBack;
-
-	public static String EnhancedSynchronizeTab_UploadLabel_Options_Executable;
-
-	public static String EnhancedSynchronizeTab_UploadLabel_Options_PreserveTimeStamp;
-
-	public static String EnhancedSynchronizeTab_UploadLabel_Options_Readonly;
-
-	public static String EnhancedSynchronizeTab_UploadLabel_OptionsLabel;
-
-	public static String EnhancedSynchronizeTab_UploadLabel_Type;
-
-	public static String UploadRuleDialog_FileButtonsFrame_AddDirectoryButton;
-
-	public static String UploadRuleDialog_FileButtonsFrame_AddFilesButton;
-
-	public static String UploadRuleDialog_FileButtonsFrame_AddWorkspaceButton;
-
-	public static String UploadRuleDialog_FileButtonsFrame_Description;
-
-	public static String UploadRuleDialog_FileButtonsFrame_RemoveButton;
-
-	public static String UploadRuleDialog_FileButtonsFrame_RemoveFilesLabel;
-
-	public static String UploadRuleDialog_FileButtonsFrame_Title;
-	
-	public static String UploadRuleDialog_Message;
-
-	public static String UploadRuleDialog_OptionsFrame_AddDirectoryDialog_Title;
-
-	public static String UploadRuleDialog_OptionsFrame_AddFileDialog_Description;
-
-	public static String UploadRuleDialog_OptionsFrame_AddFileDialog_Title;
-
-	public static String UploadRuleDialog_OptionsFrame_AddWorkspaceDialog_Description;
-
-	public static String UploadRuleDialog_OptionsFrame_AddWorkspaceDialog_Title;
-
-	public static String UploadRuleDialog_OptionsFrame_DownloadBackCheck;
-
-	public static String UploadRuleDialog_OptionsFrame_ExecutableCheck;
-
-	public static String UploadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteIfNewerOption;
-
-	public static String UploadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteOption;
-
-	public static String UploadRuleDialog_OptionsFrame_OverwriteCombo_SkipOption;
-
-	public static String UploadRuleDialog_OptionsFrame_OverwriteLabel;
-
-	public static String UploadRuleDialog_OptionsFrame_PreserveTimeStampCheck;
-
-	public static String UploadRuleDialog_OptionsFrame_ReadonlyCheck;
-
-	public static String UploadRuleDialog_OptionsFrame_Title;
-
-	public static String UploadRuleDialog_RemoteDirectoryFrame_LabelDefaultButton;
-
-	public static String UploadRuleDialog_RemoteDirectoryFrame_LabelDirectory;
-
-	public static String UploadRuleDialog_RemoteDirectoryFrame_Title;
-
-	public static String UploadRuleDialog_Title;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/RuleDialogFactory.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/RuleDialogFactory.java
deleted file mode 100755
index 408212e..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/RuleDialogFactory.java
+++ /dev/null

@@ -1,40 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.ui;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.ptp.remotetools.environment.launcher.data.DownloadRule;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ISynchronizationRule;
-import org.eclipse.ptp.remotetools.environment.launcher.data.UploadRule;
-import org.eclipse.swt.widgets.Shell;
-
-
-public class RuleDialogFactory {
-	
-	/**
-	 * Returns a new dialog that is able to edit a rule.
-	 * @param shell The SWT shell for the dialog
-	 * @param rule The rule to edit
-	 * @return The dialog or null if no dialog is known for the rule.
-	 */
-	public static Dialog createDialogForRule(Shell shell, ISynchronizationRule rule) {
-		if (rule instanceof DownloadRule) {
-			DownloadRule downloadRule = (DownloadRule) rule;
-			return new DownloadRuleDialog(shell, downloadRule);
-		} else if (rule instanceof UploadRule) {
-			UploadRule uploadRule = (UploadRule) rule;
-			return new UploadRuleDialog(shell, uploadRule);
-		} else {
-			return null;
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/SynchronizationRuleLabelProvider.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/SynchronizationRuleLabelProvider.java
deleted file mode 100755
index 28787eb..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/SynchronizationRuleLabelProvider.java
+++ /dev/null

@@ -1,168 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.ui;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.remotetools.environment.launcher.core.LinuxPath;
-import org.eclipse.ptp.remotetools.environment.launcher.data.DownloadRule;
-import org.eclipse.ptp.remotetools.environment.launcher.data.UploadRule;
-import org.eclipse.swt.graphics.Image;
-
-
-class SynchronizationRuleLabelProvider implements ILabelProvider {
-	Image uploadRuleImage = null;
-	Image downloadRuleImage = null;
-	
-	String remoteWorkingDir;
-
-	public SynchronizationRuleLabelProvider() {
-		super();
-	}
-
-	public String getRemoteWorkingDir() {
-		return remoteWorkingDir;
-	}
-
-	public void setRemoteWorkingDir(String remoteWorkingDir) {
-		this.remoteWorkingDir = remoteWorkingDir;
-	}
-
-	public Image getImage(Object element) {
-		if (element instanceof DownloadRule) {
-			return downloadRuleImage;
-		} else if (element instanceof DownloadRule) {
-			return uploadRuleImage;
-		} else {
-			return null;
-		}
-	}
-
-	public String getText(Object element) {
-		if (element instanceof DownloadRule) {
-			DownloadRule rule = (DownloadRule) element;
-			String result = Messages.EnhancedSynchronizeTab_DownloadLabel_Type;
-			if (rule.getRemoteFileCount() == 0) {
-				result += Messages.EnhancedSynchronizeTab_DownloadLabel_NoFiles;
-			} else if (rule.getRemoteFileCount() == 1) {
-				result += Messages.EnhancedSynchronizeTab_DownloadLabel_OneFile;
-			} else {
-				result += NLS.bind(Messages.EnhancedSynchronizeTab_DownloadLabel_MultipleFiles, new Integer(rule.getRemoteFileCount()));
-			}
-			if (rule.getRemoteFileCount() >= 1) {
-				result += '\n' + Messages.EnhancedSynchronizeTab_DownloadLabel_FromLabel;
-				String files[] = rule.getRemoteFilesAsStringArray();
-				for (int i = 0; i < files.length; i++) {
-					String file = files[i];
-					if (i != 0) file += Messages.EnhancedSynchronizeTab_DownloadLabel_FileListSeparator;
-					result += file;
-				}
-				result += '\n';
-				if (rule.getLocalDirectory() == null) {
-					result += Messages.EnhancedSynchronizeTab_DownloadLabel_DestinationMissing;
-				} else {
-					result += Messages.EnhancedSynchronizeTab_DownloadLabel_DestinationLabel + rule.getLocalDirectory();							
-				}
-				if (rule.isAsExecutable() || rule.isAsReadOnly() || rule.isPreserveTimeStamp()) {							result += '\n' + Messages.EnhancedSynchronizeTab_DownloadLabel_OptionsLabel;			
-					boolean comma = false;
-					if (rule.isAsExecutable()) {
-						if (comma) result += Messages.EnhancedSynchronizeTab_DownloadLabel_OptionsSeparator; else comma = true;
-						result += Messages.EnhancedSynchronizeTab_DownloadLabel_Options_Executable;
-					}
-					if (rule.isAsReadOnly()) {
-						if (comma) result += Messages.EnhancedSynchronizeTab_DownloadLabel_OptionsSeparator; else comma = true;
-						result += Messages.EnhancedSynchronizeTab_DownloadLabel_Options_Readonly;								
-					}
-					if (rule.isPreserveTimeStamp()) {
-						if (comma) result += Messages.EnhancedSynchronizeTab_DownloadLabel_OptionsSeparator; else comma = true;
-						result += Messages.EnhancedSynchronizeTab_DownloadLabel_Options_PreserveTimeStamp;
-					}
-				}
-			}
-			return result;
-		} else if (element instanceof UploadRule) {
-			UploadRule rule = (UploadRule) element;
-			String result = Messages.EnhancedSynchronizeTab_UploadLabel_Type;
-			if (rule.getRemoteFileCount() == 0) {
-				result += Messages.EnhancedSynchronizeTab_UploadLabel_NoFiles;
-			} else if (rule.getRemoteFileCount() == 1) {
-				result += Messages.EnhancedSynchronizeTab_UploadLabel_OneFile;
-			} else {
-				result += NLS.bind(Messages.EnhancedSynchronizeTab_UploadLabel_MultipleFiles, new Integer(rule.getRemoteFileCount()) );
-			}
-			if (rule.getRemoteFileCount() >= 1) {
-				result += '\n' + Messages.EnhancedSynchronizeTab_UploadLabel_FromLabel;
-				String files[] = rule.getLocalFilesAsStringArray();
-				for (int i = 0; i < files.length; i++) {
-					String file = files[i];
-					if (i != 0) file += Messages.EnhancedSynchronizeTab_UploadLabel_FileListSeparator;
-					result += file;
-				}
-				result += '\n';
-				if ((rule.getRemoteDirectory() == null) || rule.isDefaultRemoteDirectory()) {
-					result += Messages.EnhancedSynchronizeTab_UploadLabel_DestinationLabel+remoteWorkingDir;
-				} else {
-					IPath remoteWorkingPath = new Path(remoteWorkingDir);
-					IPath remotePath = new Path(rule.getRemoteDirectory());
-					if (! remotePath.isAbsolute()) {
-						remotePath = remoteWorkingPath.append(remotePath);
-					}
-					result += Messages.EnhancedSynchronizeTab_UploadLabel_DestinationLabel+LinuxPath.toString(remotePath);
-				}
-				if (rule.isAsExecutable() || rule.isAsReadOnly() || rule.isPreserveTimeStamp() || rule.isDownloadBack()) {
-					result += '\n' + Messages.EnhancedSynchronizeTab_UploadLabel_OptionsLabel;			
-					boolean comma = false;
-					if (rule.isAsExecutable()) {
-						if (comma) result += Messages.EnhancedSynchronizeTab_UploadLabel_DestinationSeparator; else comma = true;
-						result += Messages.EnhancedSynchronizeTab_UploadLabel_Options_Executable;
-					}
-					if (rule.isAsReadOnly()) {
-						if (comma) result += Messages.EnhancedSynchronizeTab_UploadLabel_DestinationSeparator; else comma = true;
-						result += Messages.EnhancedSynchronizeTab_UploadLabel_Options_Readonly;								
-					}
-					if (rule.isPreserveTimeStamp()) {
-						if (comma) result += Messages.EnhancedSynchronizeTab_UploadLabel_DestinationSeparator; else comma = true;
-						result += Messages.EnhancedSynchronizeTab_UploadLabel_Options_PreserveTimeStamp;
-					}
-					if (rule.isDownloadBack()) {
-						if (comma) result += Messages.EnhancedSynchronizeTab_UploadLabel_DestinationSeparator; else comma = true;
-						result += Messages.EnhancedSynchronizeTab_UploadLabel_Options_DownloadBack;
-					}
-				}
-			}
-			return result;					
-		} else {
-			return null;
-		}
-	}
-
-
-	public void addListener(ILabelProviderListener listener) {
-	}
-
-	public void dispose() {
-		if (uploadRuleImage != null) uploadRuleImage.dispose();
-		if (downloadRuleImage != null) downloadRuleImage.dispose();
-		uploadRuleImage = null;
-		downloadRuleImage = null;
-	}
-
-	public boolean isLabelProperty(Object element, String property) {
-		return false;
-	}
-
-	public void removeListener(ILabelProviderListener listener) {
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/UploadRuleDialog.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/UploadRuleDialog.java
deleted file mode 100755
index d3eff3a..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/UploadRuleDialog.java
+++ /dev/null

@@ -1,518 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.ui;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.ptp.remotetools.environment.launcher.data.ISynchronizationRule;
-import org.eclipse.ptp.remotetools.environment.launcher.data.OverwritePolicies;
-import org.eclipse.ptp.remotetools.environment.launcher.data.UploadRule;
-import org.eclipse.ptp.utils.ui.swt.ComboGroup;
-import org.eclipse.ptp.utils.ui.swt.ComboMold;
-import org.eclipse.ptp.utils.ui.swt.ControlsRelationshipHandler;
-import org.eclipse.ptp.utils.ui.swt.Frame;
-import org.eclipse.ptp.utils.ui.swt.FrameMold;
-import org.eclipse.ptp.utils.ui.swt.TextGroup;
-import org.eclipse.ptp.utils.ui.swt.TextMold;
-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.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.ResourceSelectionDialog;
-
-
-public class UploadRuleDialog extends TitleAreaDialog implements IRuleDialog {
-
-	Composite content;
-	Button defaultRemoteDirectoryButton;
-	ControlsRelationshipHandler remoteDirectoryRelationshipHandler;
-	TextGroup remoteDirectoryText;
-	Button asReadOnlyButton, asExecutableButton;
-	Button downloadBackButton, preserveTimeStampButton;
-	ComboGroup overwritePolicyCombo;
-	Button removeFilesButton;
-	Button addFilesFromFilesystemButton;
-	Button addDirectoriesFromFilesystemButton;
-	Button addFilesFromWorkspaceButton;
-	List fileList;
-	
-	UploadRule uploadRule;
-	
-	IPath lastSelectedDirectory = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-	private int listenersEnabled = 0;
-	
-	public UploadRuleDialog(Shell parentShell, UploadRule rule) {
-		super(parentShell);
-		
-		uploadRule = rule;
-	}
-	
-//	public UploadRuleDialog(Shell shell) {
-//		super(shell);
-//		uploadRule = new UploadRule();
-//		// set defaults
-//		uploadRule.setDefaultRemoteDirectory(true);
-//		uploadRule.setRemoteDirectory(null);
-//		uploadRule.setOverwritePolicy(OverwritePolicies.ALWAYS);
-//	}
-
-	protected Control createDialogArea(Composite parent) {
-		content = new Composite(parent, SWT.BORDER);
-		GridLayout layout = new GridLayout();
-		content.setLayout(layout);
-//		Layout l = content.getParent().getLayout();
-		content.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL));
-		setTitle(Messages.UploadRuleDialog_Title);
-		setMessage(Messages.UploadRuleDialog_Message);
-		
-		createRemoteDirectoryComposite(content);
-		createFilesComposite(content);
-		createOptionsComposite(content);
-		
-		putFieldContents();
-		
-		return content;
-	}
-
-	private void putFieldContents() {
-		disableListeners();
-		defaultRemoteDirectoryButton.setSelection(uploadRule.isDefaultRemoteDirectory());
-		remoteDirectoryRelationshipHandler.manageDependentControls(defaultRemoteDirectoryButton);
-		if (uploadRule.getRemoteDirectory() != null) {
-			remoteDirectoryText.setString(uploadRule.getRemoteDirectory());
-		} else {
-			remoteDirectoryText.setString(""); //$NON-NLS-1$
-		}
-		asReadOnlyButton.setSelection(uploadRule.isAsReadOnly()); 
-		asExecutableButton.setSelection(uploadRule.isAsExecutable());
-		downloadBackButton.setSelection(uploadRule.isDownloadBack()); 
-		preserveTimeStampButton.setSelection(uploadRule.isPreserveTimeStamp());
-		overwritePolicyCombo.selectIndexUsingID(Integer.toString(uploadRule.getOverwritePolicy()));
-		String items[] = uploadRule.getLocalFilesAsStringArray();
-		Arrays.sort(items);
-		fileList.setItems(items);
-		enableListeners();
-	}
-	
-	private void enableListeners() {
-		listenersEnabled ++;		
-	}
-
-	private void disableListeners() {
-		listenersEnabled--;
-	}
-
-	private void fetchFieldContents() {
-		disableListeners();
-		uploadRule.setDefaultRemoteDirectory(defaultRemoteDirectoryButton.getSelection());
-		uploadRule.setRemoteDirectory(remoteDirectoryText.getString());
-		uploadRule.setAsExecutable(asExecutableButton.getSelection());
-		uploadRule.setAsReadOnly(asReadOnlyButton.getSelection());
-		uploadRule.setDownloadBack(downloadBackButton.getSelection());
-		uploadRule.setPreserveTimeStamp(preserveTimeStampButton.getSelection());
-		uploadRule.setOverwritePolicy(Integer.parseInt(overwritePolicyCombo.getSelectionId()));
-		uploadRule.setLocalFiles(fileList.getItems());
-		String path =remoteDirectoryText.getString().trim();
-		if (path.length() > 0) {
-			uploadRule.setRemoteDirectory(path);
-		} else {
-			uploadRule.setRemoteDirectory(null);
-		}
-		enableListeners();
-	}
-	
-	protected void okPressed() {
-		fetchFieldContents();
-		super.okPressed();
-	}
-
-	private Composite createRemoteDirectoryComposite(Composite parent) {
-		Frame frame = new Frame(parent, Messages.UploadRuleDialog_RemoteDirectoryFrame_Title);
-		Composite contents = frame.getComposite();
-
-		defaultRemoteDirectoryButton = new Button(contents, SWT.CHECK);
-		defaultRemoteDirectoryButton.setText(Messages.UploadRuleDialog_RemoteDirectoryFrame_LabelDefaultButton);
-		defaultRemoteDirectoryButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		TextMold mold = new TextMold(TextMold.GRID_DATA_GRAB_EXCESS_SPACE | TextMold.GRID_DATA_ALIGNMENT_FILL, Messages.UploadRuleDialog_RemoteDirectoryFrame_LabelDirectory);
-		remoteDirectoryText = new TextGroup(contents, mold);
-
-		remoteDirectoryRelationshipHandler = new ControlsRelationshipHandler(defaultRemoteDirectoryButton, new Control[] {remoteDirectoryText}, false);
-		return remoteDirectoryText;
-	}
-
-	private Composite createFilesComposite(Composite parent) {
-		FrameMold frameMold = new FrameMold();
-		frameMold.setColumns(2);
-		frameMold.setTitle(Messages.UploadRuleDialog_FileButtonsFrame_Title);
-		Frame frame = new Frame(parent, frameMold);
-		frame.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		
-		Frame filesFrame = new Frame(frame.getComposite());
-		fileList = new List(filesFrame, SWT.MULTI | SWT.V_SCROLL);
-		GridData gridData = new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL);
-		gridData.heightHint=200;
-		fileList.setLayoutData(gridData);
-		fileList.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				removeFilesButton.setEnabled(fileList.getSelectionCount() != 0);
-			}
-		});
-		fileList.deselectAll();
-		
-		Frame buttonFrame = new Frame(frame.getComposite());
-		Label label = new Label(buttonFrame, SWT.NONE);
-		label.setText(Messages.UploadRuleDialog_FileButtonsFrame_Description);
-		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		addFilesFromFilesystemButton = new Button(buttonFrame, SWT.PUSH);
-		addFilesFromFilesystemButton.setText(Messages.UploadRuleDialog_FileButtonsFrame_AddFilesButton);
-		addFilesFromFilesystemButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		addFilesFromFilesystemButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				handleFilesFromFilesystemButtonEvent();
-			}			
-		});
-		addDirectoriesFromFilesystemButton = new Button(buttonFrame, SWT.PUSH);
-		addDirectoriesFromFilesystemButton.setText(Messages.UploadRuleDialog_FileButtonsFrame_AddDirectoryButton);
-		addDirectoriesFromFilesystemButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		addDirectoriesFromFilesystemButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				handleDirectoryFromFilesystemButtonEvent();
-			}			
-		});
-		addFilesFromWorkspaceButton = new Button(buttonFrame, SWT.PUSH);
-		addFilesFromWorkspaceButton.setText(Messages.UploadRuleDialog_FileButtonsFrame_AddWorkspaceButton);
-		addFilesFromWorkspaceButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		addFilesFromWorkspaceButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0) return;
-				handleFilesFromWorkspaceButtonEvent();
-			}
-		});
-		label = new Label(buttonFrame, SWT.NONE);
-		label.setText(Messages.UploadRuleDialog_FileButtonsFrame_RemoveFilesLabel);
-		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		removeFilesButton = new Button(buttonFrame, SWT.PUSH);
-		removeFilesButton.setText(Messages.UploadRuleDialog_FileButtonsFrame_RemoveButton);
-		removeFilesButton.setEnabled(false);
-		removeFilesButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		removeFilesButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0)
-					return;
-				handleRemoveFilesButtonEvent();
-			}
-			
-		});
-		GridData gridData2 = new GridData();
-		gridData2.grabExcessVerticalSpace = true;
-		gridData2.verticalAlignment = SWT.TOP;
-		buttonFrame.setLayoutData(gridData2);
-		
-		return frame;
-	}
-
-	private Composite createOptionsComposite(Composite parent) {
-		FrameMold frameMold = new FrameMold();
-		frameMold.setColumns(2);
-		frameMold.addOption(FrameMold.COLUMNS_EQUAL_WIDTH);
-		frameMold.setTitle(Messages.UploadRuleDialog_OptionsFrame_Title);
-		Frame frame = new Frame(parent, frameMold);
-		frame.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		
-		Composite contents = frame.getComposite();
-		asReadOnlyButton = new Button(contents, SWT.CHECK);
-		asReadOnlyButton.setText(Messages.UploadRuleDialog_OptionsFrame_ReadonlyCheck);
-		asExecutableButton = new Button(contents, SWT.CHECK);
-		asExecutableButton.setText(Messages.UploadRuleDialog_OptionsFrame_ExecutableCheck);
-		downloadBackButton = new Button(contents, SWT.CHECK);
-		downloadBackButton.setText(Messages.UploadRuleDialog_OptionsFrame_DownloadBackCheck);
-		preserveTimeStampButton = new Button(contents, SWT.CHECK);
-		preserveTimeStampButton.setText(Messages.UploadRuleDialog_OptionsFrame_PreserveTimeStampCheck);
-		
-		ComboMold mold = new ComboMold(ComboMold.GRID_DATA_SPAN);
-		mold.setLabel(Messages.UploadRuleDialog_OptionsFrame_OverwriteLabel);
-		mold.setTextFieldWidth(40);
-		mold.addItem(Integer.toString(OverwritePolicies.SKIP), Messages.UploadRuleDialog_OptionsFrame_OverwriteCombo_SkipOption);
-		mold.addItem(Integer.toString(OverwritePolicies.ALWAYS), Messages.UploadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteOption);
-		mold.addItem(Integer.toString(OverwritePolicies.NEWER), Messages.UploadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteIfNewerOption);
-		overwritePolicyCombo = new ComboGroup(contents, mold);
-		overwritePolicyCombo.getCombo().addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-
-			public void widgetSelected(SelectionEvent e) {
-				if (listenersEnabled < 0)
-					return;
-				disableListeners();
-				if (overwritePolicyCombo.getSelectionId().equals(Integer.toString(OverwritePolicies.NEWER))) {
-					preserveTimeStampButton.setEnabled(false);
-					preserveTimeStampButton.setSelection(true);
-				} else {
-					preserveTimeStampButton.setEnabled(true);					
-				}
-				enableListeners();
-			}
-			
-		});
-		return frame;
-	}
-	
-	class PathIterator implements Iterator {
-		Iterator internalIterator;
-		
-		public PathIterator(Iterator internalIterator) {
-			this.internalIterator = internalIterator;
-		}
-		
-		public PathIterator(String [] array) {
-			this.internalIterator = Arrays.asList(array).iterator();
-		}
-
-		public PathIterator(java.util.List list) {
-			this.internalIterator = list.iterator();
-		}
-
-		public boolean hasNext() {
-			return internalIterator.hasNext();
-		}
-		
-		public Object next() {
-			return new Path((String)internalIterator.next());
-		}
-		
-		public void remove() {
-			internalIterator.remove();
-		}
-	}
-	
-	private void handleFilesFromFilesystemButtonEvent() {
-		FileDialog fileDialog = new FileDialog(getShell(), SWT.OPEN | SWT.MULTI);
-
-		/*
-		 * Filter path must be set to the directory that contains the file.
-		 */
-		fileDialog.setFilterPath(lastSelectedDirectory.toOSString());
-		fileDialog.setText(Messages.UploadRuleDialog_OptionsFrame_AddFileDialog_Title);
-				
-		String result = fileDialog.open();
-
-		if (result != null) {
-			lastSelectedDirectory = new Path(fileDialog.getFilterPath());
-			/*
-			 * Only add files that are not already in the list.
-			 * If file is inside the workspace, add relative path.
-			 */
-			IPath workspace = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-			IPath fileRoot = new Path(fileDialog.getFilterPath());
-			HashSet fileSet = new HashSet(Arrays.asList(fileList.getItems()));
-			for (Iterator iter = new PathIterator(fileDialog.getFileNames()); iter.hasNext();) {
-				/*
-				 * If not absolute, the make it absolute according to path in dialog.
-				 * This is due behaviour how FileDialog returns selected files.
-				 */
-				IPath path = (IPath) iter.next();
-				if (! path.isAbsolute()) {
-					path = fileRoot.append(path);
-				}
-				
-				/*
-				 * If path is inside the workspace, then make it relative.
-				 */
-				if (workspace.isPrefixOf(path)) {
-					path = path.removeFirstSegments(workspace.segmentCount());
-					path = path.makeRelative();
-				}
-				
-				/*
-				 * If already in the list, the ignore.
-				 */
-				String fullPath = path.toOSString();
-				if (! fileSet.contains(fullPath)) {
-					fileSet.add(fullPath);
-				}
-			}
-			
-			String items[] = new String[fileSet.size()];
-			items = (String[]) fileSet.toArray(items);
-			Arrays.sort(items);
-			fileList.setItems(items);
-		}
-	}
-
-	private void handleDirectoryFromFilesystemButtonEvent() {
-		DirectoryDialog directoryDialog = new DirectoryDialog(getShell(), SWT.OPEN);
-		
-		directoryDialog.setFilterPath(lastSelectedDirectory.toOSString());
-		directoryDialog.setText(Messages.UploadRuleDialog_OptionsFrame_AddDirectoryDialog_Title);
-		directoryDialog.setMessage(Messages.UploadRuleDialog_OptionsFrame_AddFileDialog_Description);
-
-		String newPath = directoryDialog.open();
-
-		if (newPath != null) {
-			HashSet fileSet = new HashSet(Arrays.asList(fileList.getItems()));
-			IPath workspace = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-			IPath path = new Path(newPath);
-			
-			/*
-			 * If path is inside the workspace, then make it relative.
-			 */
-			if (workspace.isPrefixOf(path)) {
-				path = path.removeFirstSegments(workspace.segmentCount());
-				path = path.makeRelative();
-			}
-			
-			/*
-			 * If already in the list, the ignore.
-			 */
-			String fullPath = path.toOSString();
-			if (! fileSet.contains(fullPath)) {
-				fileSet.add(fullPath);
-				
-				String items[] = new String[fileSet.size()];
-				items = (String[]) fileSet.toArray(items);
-				Arrays.sort(items);
-				fileList.setItems(items);
-			}
-			
-			/*
-			 * Save lastSelectedDirectory. There is a bug in DirectoryDialog.
-			 * The method getFilterPath does not return the expected path.
-			 * The bug will be fixed in Eclipse 3.4.
-			 * The workarount takes the parent of the selected directory as lastSelectedDirectory.
-			 */
-			lastSelectedDirectory = new Path(newPath);
-			lastSelectedDirectory = lastSelectedDirectory.removeLastSegments(1).removeTrailingSeparator();
-		}
-	}
-
-
-	ResourceSelectionDialog resourceDialog = null;
-	private void handleFilesFromWorkspaceButtonEvent() {
-		/*
-		 * Create a list a resource for all relative paths. The must be valid resources in the workspace.
-		 * Otherwise, they are ignored and removed.
-		 */
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		ArrayList resourceList = new ArrayList();
-		for (Iterator iter = new PathIterator(fileList.getItems()); iter.hasNext();) {
-			IPath path = (IPath) iter.next();
-			if (path.isAbsolute()) {
-				continue;
-			}
-			IResource resource = root.findMember(path);
-			if (resource != null) {
-				resourceList.add(resource);
-			}
-		}
-		Object initialSelection[] = resourceList.toArray();
-		
-		/*
-		 * Show the dialog.
-		 */
-		if (resourceDialog == null) {
-			resourceDialog = new ResourceSelectionDialog(getShell(), ResourcesPlugin.getWorkspace().getRoot(), null);
-		}
-		resourceDialog.setInitialSelections( initialSelection );
-		resourceDialog.setBlockOnOpen(true);
-		resourceDialog.setMessage(Messages.UploadRuleDialog_OptionsFrame_AddWorkspaceDialog_Description);
-		resourceDialog.setTitle(Messages.UploadRuleDialog_OptionsFrame_AddWorkspaceDialog_Title);
-		resourceDialog.open();
-
-		/*
-		 * Get results and updated local files.
-		 */
-		Object[] results = resourceDialog.getResult();
-
-		if (results != null) {
-			/*
-			 * Filter only absolute path. Relative paths are removed.
-			 */
-			HashSet newFileList = new HashSet();
-			for (Iterator iter = new PathIterator(fileList.getItems()); iter.hasNext();) {
-				IPath path = (IPath) iter.next();
-				if (! path.isAbsolute()) {
-					continue;
-				}
-				newFileList.add(path.toOSString());
-			}
-
-			/*
-			 * Add items that a selected in the dialog but not in the file list.
-			 */
-			for (int i = 0; i < results.length; i++) {
-				IResource resource = (IResource) results[i];
-				String entry = resource.getFullPath().makeRelative().toOSString();
-				newFileList.add(entry);
-			}
-			
-			String items[] = new String[newFileList.size()];
-			items = (String[]) newFileList.toArray(items);
-			Arrays.sort(items);
-			fileList.setItems(items);
-		}
-	}
-	
-	private void handleRemoveFilesButtonEvent() {		
-		String selection [] = fileList.getSelection();
-		if (selection.length == 0) {
-			return;
-		}
-		
-		HashSet fileSet = new HashSet(Arrays.asList(fileList.getItems()));
-		for (int i = 0; i < selection.length; i++) {
-			String string = selection[i];
-			fileSet.remove(string);
-		}
-		
-		String items[] = new String[fileSet.size()];
-		items = (String[]) fileSet.toArray(items);
-		Arrays.sort(items);
-		fileList.setItems(items);
-	}
-
-	public ISynchronizationRule getRuleWorkingCopy() {
-		return uploadRule;
-	}
-}
-

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/messages.properties
deleted file mode 100755
index 72e5dd0..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/ui/messages.properties
+++ /dev/null

@@ -1,109 +0,0 @@
-###############################################################################
-# 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
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-EnhancedSynchronizeTab_Tab_Message=Add synchronization rules to upload files before the launch or to download files after the application terminates.
-EnhancedSynchronizeTab_RulesFrame_Title=Synchronize rules:
-EnhancedSynchronizeTab_RulesFrame_Description=Upload rules are executed before application starts. Download rules are executed after application finishes.
-EnhancedSynchronizeTab_DownloadLabel_Type=DOWNLOAD 
-EnhancedSynchronizeTab_DownloadLabel_NoFiles=(no files/directories)
-EnhancedSynchronizeTab_DownloadLabel_OneFile=1 item 
-EnhancedSynchronizeTab_DownloadLabel_MultipleFiles={0} items 
-EnhancedSynchronizeTab_DownloadLabel_FromLabel=From: 
-EnhancedSynchronizeTab_DownloadLabel_FileListSeparator=; 
-EnhancedSynchronizeTab_DownloadLabel_DestinationMissing=To: <missing local destination>
-EnhancedSynchronizeTab_DownloadLabel_DestinationLabel=To: 
-EnhancedSynchronizeTab_DownloadLabel_OptionsLabel=Options: 
-EnhancedSynchronizeTab_DownloadLabel_OptionsSeparator=; 
-EnhancedSynchronizeTab_DownloadLabel_Options_Executable=executable
-EnhancedSynchronizeTab_DownloadLabel_Options_Readonly=readonly
-EnhancedSynchronizeTab_DownloadLabel_Options_PreserveTimeStamp=preserve time/date
-EnhancedSynchronizeTab_UploadLabel_Type=UPLOAD 
-EnhancedSynchronizeTab_UploadLabel_NoFiles=(no files/directories)
-EnhancedSynchronizeTab_UploadLabel_OneFile=1 item 
-EnhancedSynchronizeTab_UploadLabel_MultipleFiles={0} items 
-EnhancedSynchronizeTab_UploadLabel_FromLabel=From: 
-EnhancedSynchronizeTab_UploadLabel_FileListSeparator=; 
-EnhancedSynchronizeTab_UploadLabel_DestinationLabel=To: 
-EnhancedSynchronizeTab_UploadLabel_OptionsLabel=Options: 
-EnhancedSynchronizeTab_UploadLabel_DestinationSeparator=; 
-EnhancedSynchronizeTab_UploadLabel_Options_Executable=executable
-EnhancedSynchronizeTab_UploadLabel_Options_Readonly=readonly
-EnhancedSynchronizeTab_UploadLabel_Options_PreserveTimeStamp=preserve time/date
-EnhancedSynchronizeTab_UploadLabel_Options_DownloadBack=download back changes
-EnhancedSynchronizeTab_RulesFrame_Options_UploadEnabled=Upload rules enabled
-EnhancedSynchronizeTab_RulesFrame_Options_DownloadEnabled=Download rules enabled
-EnhancedSynchronizeTab_RulesFrame_Actions_NewUploadRule=New upload rule
-EnhancedSynchronizeTab_RulesFrame_Actions_DownloadRule=New download rule
-EnhancedSynchronizeTab_RulesFrame_Actions_EditSelectedRule=Edit selected
-EnhancedSynchronizeTab_RulesFrame_Actions_RemoveSelectedRules=Remove selected
-EnhancedSynchronizeTab_Tab_Title=Synchronize
-EnhancedSynchronizeTab_ErrorMessage_NewRule_Title=New rule
-EnhancedSynchronizeTab_ErrorMessage_NewRule_DontKnowRuleType=Launcher does not know how to edit this type of rule.
-
-UploadRuleDialog_Title=Upload Rule
-UploadRuleDialog_Message=Please specify the remote directory and a list of files that shall be uploaded.
-UploadRuleDialog_OptionsFrame_Title=Options for all selected file(s):
-UploadRuleDialog_RemoteDirectoryFrame_LabelDefaultButton=Use directory from launch configuration
-UploadRuleDialog_OptionsFrame_OverwriteCombo_SkipOption=Skip
-UploadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteOption=Overwrite
-UploadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteIfNewerOption=Overwrite if newer
-UploadRuleDialog_OptionsFrame_AddFileDialog_Description=Select directory to add
-UploadRuleDialog_OptionsFrame_AddWorkspaceDialog_Description=Select the ressources from workspace to add
-UploadRuleDialog_RemoteDirectoryFrame_LabelDirectory=Remote directory:
-UploadRuleDialog_RemoteDirectoryFrame_Title=Remote directory:
-UploadRuleDialog_FileButtonsFrame_Title=Selected file(s):
-UploadRuleDialog_FileButtonsFrame_Description=Add files:
-UploadRuleDialog_FileButtonsFrame_AddFilesButton=File(s)
-UploadRuleDialog_FileButtonsFrame_AddDirectoryButton=Directory
-UploadRuleDialog_FileButtonsFrame_AddWorkspaceButton=Workspace
-UploadRuleDialog_FileButtonsFrame_RemoveFilesLabel=Remove files:
-UploadRuleDialog_FileButtonsFrame_RemoveButton=Remove selected
-UploadRuleDialog_OptionsFrame_ReadonlyCheck=Readonly
-UploadRuleDialog_OptionsFrame_ExecutableCheck=Executable
-UploadRuleDialog_OptionsFrame_DownloadBackCheck=Download back if changed
-UploadRuleDialog_OptionsFrame_PreserveTimeStampCheck=Preserve time attributes
-UploadRuleDialog_OptionsFrame_OverwriteLabel=If file already exists:
-UploadRuleDialog_OptionsFrame_AddFileDialog_Title=Select file(s) to add
-UploadRuleDialog_OptionsFrame_AddDirectoryDialog_Title=Select directory to add
-UploadRuleDialog_OptionsFrame_AddWorkspaceDialog_Title=Workspace resources
-LauncherExecutionTab_ArgumentsFrame_Title=Arguments:
-LauncherExecutionTab_ArgumentsFrame_CommandLineLabel=Command line arguments
-LauncherExecutionTab_ObserverFrame_Title=Customize application launch:
-LauncherExecutionTab_ObserverFrame_ParserLabel=Output parser:
-LauncherExecutionTab_ObserverFrame_BashCommandsBeforeLAbel=Bash commands, executed before application
-LauncherExecutionTab_ObserverFrame_BashCommandsAfterLabel=Bash commands, executed after application
-LauncherExecutionTab_Validation_ObserverAndNoConsole=Cannot set observer if no console is allocated (see Common Tab)
-LauncherExecutionTab_ObserverFrame_ObserverCombo_DefaultNoneOption=none
-LauncherExecutionTab_Tab_Title=Launch
-
-DownloadRuleDialog_Title=Download Rule
-DownloadRuleDialog_Message=Please specify the remote files that shall be downloaded and a local directory.
-DownloadRuleDialog_DestinationFrame_Title=Local destination directory:
-DownloadRuleDialog_DestinationFrame_FileSystemButton=File system
-DownloadRuleDialog_DestinationFrame_WorkspaceButton=Workspace
-DownloadRuleDialog_OptionsFrame_Title=Options for all selected file(s):
-DownloadRuleDialog_OptionsFrame_ReadonlyCheck=Readonly
-DownloadRuleDialog_OptionsFrame_ExecutableCheck=Executable
-DownloadRuleDialog_OptionsFrame_PreserveTimeStampCheck=Preserve time attributes
-DownloadRuleDialog_OptionsFrame_OverwriteLabel=If file already exists:
-DownloadRuleDialog_OptionsFrame_OverwriteCombo_SkipOption=Skip
-DownloadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteAlwaysOption=Overwrite
-DownloadRuleDialog_OptionsFrame_OverwriteCombo_OverwriteIfNewerOption=Overwrite if newer
-DownloadRuleDialog_FileListFrame_Title=Selected file(s):
-DownloadRuleDialog_FileListFrame_AddButton=Add new
-DownloadRuleDialog_FileListFrame_EditButton=Change selected
-DownloadRuleDialog_FileListFrame_RemoveButton=Remove selected
-DownloadRuleDialog_DirectoryDialog_Title=Select local destination
-DownloadRuleDialog_DirectoryDialog_Message=Select local destination directory
-DownloadRuleDialog_WorkspaceDialog_Title=Select folder:
-DownloadRuleDialog_AddFileDialog_Title=Add remote file/directoty
-DownloadRuleDialog_AddFileDialog_Message=Remote file or directory to be added:
-DownloadRuleDialog_EditFileDialog_Title=Add remote file/directoty
-DownloadRuleDialog_EditFileDialog_Message=Remote file or directory to be added:

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/variables/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/variables/Messages.java
deleted file mode 100755
index 27ff829..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/variables/Messages.java
+++ /dev/null

@@ -1,29 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.variables;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remotetools.environment.launcher.variables.messages"; //$NON-NLS-1$
-
-	public static String invalidEclipseVariableErrorMessage;
-
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/variables/RemoteWorkspaceResolver.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/variables/RemoteWorkspaceResolver.java
deleted file mode 100755
index fff3593..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/variables/RemoteWorkspaceResolver.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.environment.launcher.variables;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.variables.IDynamicVariable;
-import org.eclipse.core.variables.IDynamicVariableResolver;
-import org.eclipse.ptp.remotetools.environment.launcher.RemoteLauncherPlugin;
-
-/**
- * @author laggarcia
- * @since 3.0.0
- */
-public class RemoteWorkspaceResolver implements IDynamicVariableResolver {
-
-	protected static final String USER_WORKSPACE_VARIABLE = "user_workspace"; //$NON-NLS-1$
-
-	protected static final String CONCATENATE_CHAR = "_"; //$NON-NLS-1$
-
-	protected static final String DEFAULT_USER_WORKSPACE = "generic_user_workspace"; //$NON-NLS-1$
-
-	public RemoteWorkspaceResolver() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.variables.IDynamicVariableResolver#resolveValue(org.eclipse.core.variables.IDynamicVariable,
-	 *      java.lang.String)
-	 */
-	public String resolveValue(IDynamicVariable variable, String argument)
-			throws CoreException {
-
-		String variableName = variable.getName();
-
-		if (variableName.equals(USER_WORKSPACE_VARIABLE)) {
-			try {
-				String hostname = InetAddress.getLocalHost().getHostName();
-				String username = System.getProperty("user.name"); //$NON-NLS-1$
-				return hostname + CONCATENATE_CHAR + username;
-			} catch (UnknownHostException uhe) {
-				uhe.printStackTrace();
-				return DEFAULT_USER_WORKSPACE;
-			}
-		}
-		throw new CoreException(new Status(IStatus.ERROR, RemoteLauncherPlugin
-				.getUniqueIdentifier(), IStatus.OK,
-				Messages.invalidEclipseVariableErrorMessage, null));
-
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/variables/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/variables/messages.properties
deleted file mode 100755
index e333b9d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher/src/org/eclipse/ptp/remotetools/environment/launcher/variables/messages.properties
+++ /dev/null

@@ -1,12 +0,0 @@
-###############################################################################
-# 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
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-
-invalidEclipseVariableErrorMessage=Invalid Eclipse variable.
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/.classpath b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/.classpath
deleted file mode 100755
index 64c5e31..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/.project b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/.project
deleted file mode 100755
index 807fd42..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.remotetools.environment.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/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/.settings/org.eclipse.jdt.core.prefs b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 70ee94a..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,8 +0,0 @@
-#Fri Apr 16 12:59:47 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/remotetools/org.eclipse.ptp.remotetools.environment.ui/META-INF/MANIFEST.MF b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/META-INF/MANIFEST.MF
deleted file mode 100755
index f9349eb..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/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.remotetools.environment.ui;singleton:=true
-Bundle-Version: 1.3.2.qualifier
-Bundle-Activator: org.eclipse.ptp.remotetools.environment.ui.UIEnvironmentPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ptp.remotetools.environment.core,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.ui
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.ptp.remotetools.environment.ui,
- org.eclipse.ptp.remotetools.environment.ui.extension,
- org.eclipse.ptp.remotetools.environment.ui.views
-Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/about.html b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/about.html
deleted file mode 100755
index 094b431..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/about.html
+++ /dev/null

@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html lang="en">
-  <head>
-    <title>About</title>
-    <meta content="">
-    <style></style>
-  </head>
-
-<body>
-<h2>About This Content</h2>
-<h3>License</h3>
-<p>This plug-in is provided by IBM Corp. Your use of this plug-in is governed by the license that was agreed to when the plug-in was installed as part of a feature installation.</p>
-</body>
-</html>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/build.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/build.properties
deleted file mode 100755
index 74f4c7d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/build.properties
+++ /dev/null

@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               icons/,\
-               about.html,\
-               plugin.properties

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/agent_detach_obj.gif b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/agent_detach_obj.gif
deleted file mode 100755
index b0d072a..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/agent_detach_obj.gif
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/connect_create.gif b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/connect_create.gif
deleted file mode 100644
index 6fc8305..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/connect_create.gif
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/iprocess.gif b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/iprocess.gif
deleted file mode 100755
index 7c6d735..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/iprocess.gif
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/monitor_obj.gif b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/monitor_obj.gif
deleted file mode 100755
index fe85575..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/monitor_obj.gif
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/nglinux.gif b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/nglinux.gif
deleted file mode 100755
index 7c135cf..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/nglinux.gif
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/resume.gif b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/resume.gif
deleted file mode 100755
index 16f4e25..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/resume.gif
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/run_exc.gif b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/run_exc.gif
deleted file mode 100755
index b88fb72..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/run_exc.gif
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/sample.gif b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/sample.gif
deleted file mode 100755
index 34fb3c9..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/sample.gif
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/suspend.gif b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/suspend.gif
deleted file mode 100755
index b51b80b..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/suspend.gif
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/terminatedlaunch.gif b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/terminatedlaunch.gif
deleted file mode 100755
index dc47edf..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/icons/terminatedlaunch.gif
+++ /dev/null
Binary files differ

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/plugin.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/plugin.properties
deleted file mode 100644
index 25de2de..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/plugin.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP Remote Tools Target Environments UI
-pluginProvider=Eclipse.org

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/plugin.xml b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/plugin.xml
deleted file mode 100755
index af595b9..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/plugin.xml
+++ /dev/null

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   <extension-point id="workloadController" name="Remote Environment Workload Controller" schema="schema/workloadController.exsd"/>
-   <extension-point id="doubleClickHandler" name="Double Click Handler" schema="schema/doubleClickHandler.exsd"/>
-
-   <extension
-         point="org.eclipse.ui.views">
-      <category
-            name="Remote Tools"
-            id="org.eclipse.ptp.remotetools">
-      </category>
-      <view
-            name="Remote Environments"
-            icon="icons/iprocess.gif"
-            category="org.eclipse.ptp.remotetools"
-            class="org.eclipse.ptp.remotetools.environment.ui.views.RemoteToolsEnvironmentView"
-            id="org.eclipse.ptp.remotetools.environment.ui.views.RemoteEnvironmentsView">
-      </view>
-   </extension>
-   <extension
-         point="org.eclipse.ui.perspectiveExtensions">
-      <perspectiveExtension
-            targetID="org.eclipse.cdt.ui.CPerspective">
-         <view
-               id="org.eclipse.ptp.remotetools.environment.ui.views.RemoteEnvironmentsView"
-               ratio="0.5"
-               relationship="stack"
-               relative="org.eclipse.ui.console.ConsoleView"
-               showTitle="true"
-               visible="true">
-         </view>
-      </perspectiveExtension>
-      <perspectiveExtension
-            targetID="org.eclipse.ptp.ui.PTPRunPerspective">
-         <view
-               id="org.eclipse.ptp.remotetools.environment.ui.views.RemoteEnvironmentsView"
-               minimized="false"
-               relationship="stack"
-               relative="org.eclipse.ui.views.PropertySheet">
-         </view>
-      </perspectiveExtension>
-      <perspectiveExtension
-            targetID="org.eclipse.ptp.rdt.ui.remoteCPerspective">
-         <view
-               id="org.eclipse.ptp.remotetools.environment.ui.views.RemoteEnvironmentsView"
-               minimized="false"
-               relationship="stack"
-               relative="org.eclipse.ptp.rdt.ui.callHierarchy">
-         </view>
-      </perspectiveExtension>
-   </extension>
-
-</plugin>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/schema/doubleClickHandler.exsd b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/schema/doubleClickHandler.exsd
deleted file mode 100644
index 2cd6f66..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/schema/doubleClickHandler.exsd
+++ /dev/null

@@ -1,105 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ptp.remotetools.environment.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ptp.remotetools.environment.ui" id="doubleClickHandler" name="Double Click Handler"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="doubleClickHandler"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="doubleClickHandler">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.ptp.remotetools.environment.ui.extension.IDoubleClickHandler"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/schema/workloadController.exsd b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/schema/workloadController.exsd
deleted file mode 100644
index 4192fe9..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/schema/workloadController.exsd
+++ /dev/null

@@ -1,105 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ptp.remotetools.environment.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ptp.remotetools.environment.ui" id="workloadController" name="Remote Environment Workload Controller"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence minOccurs="1" maxOccurs="unbounded">
-            <element ref="controllerDelegate"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="controllerDelegate">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.jface.action.Action:org.eclipse.jface.viewers.ISelectionChangedListener"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/UIEnvironmentPlugin.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/UIEnvironmentPlugin.java
deleted file mode 100755
index dd21c45..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/UIEnvironmentPlugin.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.ui;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.remotetools.environment.ui.extension.DoubleClickHandlerManager;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- * 
- * @author Ricardo M. Matinata
- * @since 1.1
- */
-public class UIEnvironmentPlugin extends AbstractUIPlugin {
-
-	//The shared instance.
-	private static UIEnvironmentPlugin plugin;
-	
-	private DoubleClickHandlerManager doubleClickHandlerMgr;
-	
-	/**
-	 * The constructor.
-	 */
-	public UIEnvironmentPlugin() {
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static UIEnvironmentPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.ptp.remotetools.environment", path); //$NON-NLS-1$
-	}
-	
-	public DoubleClickHandlerManager getDoubleClickHandlerManager() {
-	    if (doubleClickHandlerMgr == null) {
-	        doubleClickHandlerMgr = new DoubleClickHandlerManager();
-	    }
-	    return doubleClickHandlerMgr;
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/extension/DoubleClickHandlerManager.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/extension/DoubleClickHandlerManager.java
deleted file mode 100644
index 92499ee..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/extension/DoubleClickHandlerManager.java
+++ /dev/null

@@ -1,73 +0,0 @@
-/**
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-
-package org.eclipse.ptp.remotetools.environment.ui.extension;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.ptp.remotetools.environment.extension.INode;
-
-/**
- * Manage a list of <code>IDoubleClickHandler</code> contributed by extensions
- * 
- * @author Hong Chang Lin
- * 
- */
-public class DoubleClickHandlerManager {
-
-    private final static String EXT_HANDLER_ID = "org.eclipse.ptp.remotetools.environment.ui.doubleClickHandler"; //$NON-NLS-1$
-
-    private List<IDoubleClickHandler> handlers;
-
-    public DoubleClickHandlerManager() {
-        processDoubleClickHandlers();
-    }
-
-    public boolean doubleClickExecute(INode node) {
-        for (IDoubleClickHandler handler : handlers) {
-            if (handler.handle(node)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private void processDoubleClickHandlers() {
-        handlers = new ArrayList<IDoubleClickHandler>();
-
-        IExtensionRegistry registry = Platform.getExtensionRegistry();
-        IExtensionPoint extensionPoint = registry
-                .getExtensionPoint(EXT_HANDLER_ID);
-        IExtension[] extensions = extensionPoint.getExtensions();
-
-        try {
-            for (int i = 0; i < extensions.length; i++) {
-                IExtension extension = extensions[i];
-                IConfigurationElement[] elements = extension
-                        .getConfigurationElements();
-                IConfigurationElement element = elements[0];
-                if ("doubleClickHandler".equals(element.getName())) { //$NON-NLS-1$
-                    handlers.add((IDoubleClickHandler) element
-                            .createExecutableExtension("class")); //$NON-NLS-1$
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/extension/IDoubleClickHandler.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/extension/IDoubleClickHandler.java
deleted file mode 100644
index 83a0770..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/extension/IDoubleClickHandler.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/**
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-
-package org.eclipse.ptp.remotetools.environment.ui.extension;
-
-import org.eclipse.ptp.remotetools.environment.extension.INode;
-
-/**
- * The interface to handle the double click on an <code>INode</code>
- * 
- * @author Hong Chang Lin
- * 
- */
-public interface IDoubleClickHandler {
-
-    /**
-     * @param node
-     * @return true if the double click on the node can be handled
-     */
-    public boolean handle(INode node);
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/messages/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/messages/Messages.java
deleted file mode 100644
index e91e417..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/messages/Messages.java
+++ /dev/null

@@ -1,46 +0,0 @@
-package org.eclipse.ptp.remotetools.environment.ui.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remotetools.environment.ui.messages.messages"; //$NON-NLS-1$
-	public static String RemoteToolsEnvironmentView_0;
-	public static String RemoteToolsEnvironmentView_1;
-	public static String RemoteToolsEnvironmentView_17;
-	public static String RemoteToolsEnvironmentView_18;
-	public static String RemoteToolsEnvironmentView_19;
-	public static String RemoteToolsEnvironmentView_20;
-	public static String RemoteToolsEnvironmentView_21;
-	public static String RemoteToolsEnvironmentView_22;
-	public static String RemoteToolsEnvironmentView_23;
-	public static String RemoteToolsEnvironmentView_24;
-	public static String RemoteToolsEnvironmentView_25;
-	public static String RemoteToolsEnvironmentView_26;
-	public static String RemoteToolsEnvironmentView_27;
-	public static String RemoteToolsEnvironmentView_28;
-	public static String RemoteToolsEnvironmentView_29;
-	public static String RemoteToolsEnvironmentView_3;
-	public static String RemoteToolsEnvironmentView_30;
-	public static String RemoteToolsEnvironmentView_31;
-	public static String RemoteToolsEnvironmentView_32;
-	public static String RemoteToolsEnvironmentView_33;
-	public static String RemoteToolsEnvironmentView_34;
-	public static String RemoteToolsEnvironmentView_35;
-	public static String RemoteToolsEnvironmentView_36;
-	public static String RemoteToolsEnvironmentView_37;
-	public static String RemoteToolsEnvironmentView_38;
-	public static String RemoteToolsEnvironmentView_39;
-	public static String RemoteToolsEnvironmentView_4;
-	public static String RemoteToolsEnvironmentView_40;
-	public static String RemoteToolsEnvironmentView_41;
-	public static String RemoteToolsEnvironmentView_42;
-	public static String RemoteToolsEnvironmentView_5;
-	public static String RemoteToolsEnvironmentView_6;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/messages/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/messages/messages.properties
deleted file mode 100644
index e45b6a2..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/messages/messages.properties
+++ /dev/null

@@ -1,32 +0,0 @@
-RemoteToolsEnvironmentView_0=Target Environment
-RemoteToolsEnvironmentView_1=Status
-RemoteToolsEnvironmentView_17=Start the  Environment
-RemoteToolsEnvironmentView_18=Please Select a Target Configuration first
-RemoteToolsEnvironmentView_19=Create
-RemoteToolsEnvironmentView_20=Start the Environment
-RemoteToolsEnvironmentView_21=Stop the  Environment
-RemoteToolsEnvironmentView_22=Please Select a Target Configuration first
-RemoteToolsEnvironmentView_23=Kill
-RemoteToolsEnvironmentView_24=Kill the Environment
-RemoteToolsEnvironmentView_25=Resume the  Environment
-RemoteToolsEnvironmentView_26=Please Select a Target Configuration first
-RemoteToolsEnvironmentView_27=Resume
-RemoteToolsEnvironmentView_28=Resume
-RemoteToolsEnvironmentView_29=Pause the  Environment
-RemoteToolsEnvironmentView_3=Started
-RemoteToolsEnvironmentView_30=Please Select a Target Configuration first
-RemoteToolsEnvironmentView_31=Pause
-RemoteToolsEnvironmentView_32=Pause
-RemoteToolsEnvironmentView_33=Create
-RemoteToolsEnvironmentView_34=Creates a new configuration
-RemoteToolsEnvironmentView_35=Edit
-RemoteToolsEnvironmentView_36=Edits configuration
-RemoteToolsEnvironmentView_37=Do you really want to remove ?
-RemoteToolsEnvironmentView_38=Please stop this instance first \!
-RemoteToolsEnvironmentView_39=Remove
-RemoteToolsEnvironmentView_4=Stopped
-RemoteToolsEnvironmentView_40=Removes configuration
-RemoteToolsEnvironmentView_41=Environments
-RemoteToolsEnvironmentView_42=Environments
-RemoteToolsEnvironmentView_5=Running
-RemoteToolsEnvironmentView_6=Paused

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/views/RemoteToolsEnvironmentView.java b/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/views/RemoteToolsEnvironmentView.java
deleted file mode 100755
index 1c0327f..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui/src/org/eclipse/ptp/remotetools/environment/ui/views/RemoteToolsEnvironmentView.java
+++ /dev/null

@@ -1,954 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.environment.ui.views;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-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.IExtensionRegistry;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.IJobChangeListener;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ptp.remotetools.environment.EnvironmentPlugin;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControl;
-import org.eclipse.ptp.remotetools.environment.core.ITargetElement;
-import org.eclipse.ptp.remotetools.environment.core.ITargetElementStatus;
-import org.eclipse.ptp.remotetools.environment.core.ITargetEnvironmentEventListener;
-import org.eclipse.ptp.remotetools.environment.core.ITargetEventListener;
-import org.eclipse.ptp.remotetools.environment.core.TargetElement;
-import org.eclipse.ptp.remotetools.environment.core.TargetEnvironmentManager;
-import org.eclipse.ptp.remotetools.environment.core.TargetTypeElement;
-import org.eclipse.ptp.remotetools.environment.extension.INode;
-import org.eclipse.ptp.remotetools.environment.ui.UIEnvironmentPlugin;
-import org.eclipse.ptp.remotetools.environment.ui.messages.Messages;
-import org.eclipse.ptp.remotetools.environment.wizard.EnvironmentWizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeColumn;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.ui.part.ViewPart;
-
-/**
- * 
- * The view uses a label provider to define how model objects should be
- * presented in the view. Each view can present the same model objects using
- * different labels and icons, if needed. Alternatively, a single label provider
- * can be shared between views in order to ensure that objects of the same type
- * are presented in the same way everywhere.
- * <p>
- * 
- * @author Ricardo M. Matinata
- * @since 1.1
- */
-
-public class RemoteToolsEnvironmentView extends ViewPart implements ISelectionChangedListener, ITargetEventListener {
-
-	private TreeViewer viewer;
-	private Action startAction;
-	private Action stopAction;
-	private Action resumeAction;
-	private Action pauseAction;
-	private Action createAction;
-	private Action editAction;
-	private Action removeAction;
-	private Action doubleClickAction;
-
-	private List<Action> workloadControllers = new ArrayList<Action>();
-	// Set the table column property names
-	private final String ENVIRONMENT_CONTROL_NAME = Messages.RemoteToolsEnvironmentView_0;
-	private final String ENVIRONMENT_CONTROL_STATUS = Messages.RemoteToolsEnvironmentView_1;
-
-	// Set column names
-	private final String[] columnNames = new String[] { ENVIRONMENT_CONTROL_NAME, ENVIRONMENT_CONTROL_STATUS };
-
-	// Model
-	private final TargetEnvironmentManager model = EnvironmentPlugin.getDefault().getTargetsManager();
-	private ITargetElement currentElement = null;
-
-	private final ITargetEnvironmentEventListener eventListener = new ITargetEnvironmentEventListener() {
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.ptp.remotetools.environment.core.
-		 * ITargetEnvironmentEventListener
-		 * #elementAdded(org.eclipse.ptp.remotetools
-		 * .environment.core.TargetElement)
-		 */
-		public void elementAdded(TargetElement element) {
-			refresh();
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.ptp.remotetools.environment.core.
-		 * ITargetEnvironmentEventListener
-		 * #elementRemoved(org.eclipse.ptp.remotetools
-		 * .environment.core.ITargetElement)
-		 */
-		public void elementRemoved(ITargetElement element) {
-			refresh();
-		}
-	};
-
-	/*
-	 * The content provider class is responsible for providing objects to the
-	 * view. It can wrap existing objects in adapters or simply return objects
-	 * as-is. These objects may be sensitive to the current input of the view,
-	 * or ignore it and always show the same content (like Task List, for
-	 * example).
-	 */
-
-	private class ViewContentProvider implements ITreeContentProvider {
-		private final Object[] EMPTY = new Object[] {};
-
-		/**
-		 * Gets the children for a TargetEnvironmentTypeElement or
-		 * TargetEnvironmentConfigElement
-		 * 
-		 * @param element
-		 *            the TargetEnvironmentTypeElement or
-		 *            TargetEnvironmentConfigElement
-		 * @return Object[]
-		 */
-		public Object[] getChildren(Object element) {
-			if (element instanceof TargetTypeElement) {
-				return ((TargetTypeElement) element).getElements().toArray();
-			} else if (element instanceof ITargetElement) {
-				// gets the children of ITargetElement
-				return EnvironmentPlugin.getDefault().getChildrenProviderManager().getChildren((ITargetElement) element);
-			} else if (element instanceof INode) {
-				return ((INode) element).getChildren();
-			}
-			return EMPTY;
-		}
-
-		/**
-		 * Gets the parent TargetEnvironmentTypeElement for a
-		 * TargetEnvironmentConfigElement
-		 * 
-		 * @param arg0
-		 *            the TargetEnvironmentConfigElement
-		 * @return Object
-		 */
-		public Object getParent(Object element) {
-			if (element instanceof ITargetElement) {
-				return ((ITargetElement) element).getType();
-			} else if (element instanceof INode) {
-				return ((INode) element).getParent();
-			}
-			return null;
-		}
-
-		/**
-		 * Gets whether this team or player has children
-		 * 
-		 * @param arg0
-		 *            the TargetEnvironmentTypeElement or
-		 *            TargetEnvironmentConfigElement
-		 * @return boolean
-		 */
-		public boolean hasChildren(Object element) {
-			return getChildren(element).length > 0;
-		}
-
-		/**
-		 * Gets the elements for the table
-		 * 
-		 * @param arg0
-		 *            the model
-		 * @return Object[]
-		 */
-		public Object[] getElements(Object element) {
-			if (element instanceof Object[]) {
-				return (Object[]) element;
-			}
-			return getChildren(element);
-		}
-
-		/**
-		 * Disposes any resources
-		 */
-		public void dispose() {
-		}
-
-		/**
-		 * Called when the input changes
-		 * 
-		 * @param viewer
-		 *            the parent viewer
-		 * @param oldInput
-		 *            the old input
-		 * @param newInput
-		 *            the new input
-		 */
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-			// Do nothing
-		}
-	}
-
-	private class ViewLabelProvider extends LabelProvider implements ITableLabelProvider {
-		private Image viewIcon;
-
-		public String getColumnText(Object obj, int index) {
-			String result = ""; //$NON-NLS-1$
-
-			switch (index) {
-			case 0:
-				if (obj instanceof INode) {
-					result = ((INode) obj).getDisplayText();
-				} else {
-					result = obj.toString();
-				}
-				break;
-			case 1:
-				if (TargetElement.class.isAssignableFrom(obj.getClass())) {
-					int status = ((ITargetElement) obj).getStatus();
-
-					switch (status) {
-					case ITargetElementStatus.STARTED:
-						result = Messages.RemoteToolsEnvironmentView_3;
-						break;
-					case ITargetElementStatus.STOPPED:
-						result = Messages.RemoteToolsEnvironmentView_4;
-						break;
-					case ITargetElementStatus.RESUMED:
-						result = Messages.RemoteToolsEnvironmentView_5;
-						break;
-					case ITargetElementStatus.PAUSED:
-						result = Messages.RemoteToolsEnvironmentView_6;
-						break;
-					}
-
-				}
-				break;
-			}
-			return result;
-		}
-
-		public Image getColumnImage(Object obj, int index) {
-			if (index == 0) {
-				if (obj instanceof INode) {
-					return ((INode) obj).getIcon();
-				} else {
-					return getImage(obj);
-				}
-			}
-			return null;
-		}
-
-		@Override
-		public Image getImage(Object obj) {
-			if (TargetTypeElement.class.isAssignableFrom(obj.getClass())) {
-				URL url = UIEnvironmentPlugin.getDefault().getBundle().getEntry("/icons/connect_create.gif"); //$NON-NLS-1$
-				ImageDescriptor imageMonitorDescriptor = ImageDescriptor.createFromURL(url);
-				viewIcon = imageMonitorDescriptor.createImage();
-			} else if (TargetElement.class.isAssignableFrom(obj.getClass())) {
-				URL url = UIEnvironmentPlugin.getDefault().getBundle().getEntry("/icons/monitor_obj.gif"); //$NON-NLS-1$
-				ImageDescriptor imageMonitorDescriptor = ImageDescriptor.createFromURL(url);
-				viewIcon = imageMonitorDescriptor.createImage();
-			}
-			return viewIcon;
-		}
-
-		@Override
-		public void dispose() {
-			super.dispose();
-			if (viewIcon != null) {
-				viewIcon.dispose();
-				viewIcon = null;
-			}
-		}
-	}
-
-	class NameSorter extends ViewerSorter {
-	}
-
-	/**
-	 * The constructor.
-	 */
-	public RemoteToolsEnvironmentView() {
-	}
-
-	/**
-	 * This is a callback that will allow us to create the viewer and initialize
-	 * it.
-	 */
-	@Override
-	public void createPartControl(Composite parent) {
-
-		viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
-		viewer.setContentProvider(new ViewContentProvider());
-		viewer.setLabelProvider(new ViewLabelProvider());
-		viewer.setSorter(new NameSorter());
-		defineTable(viewer);
-		viewer.setColumnProperties(columnNames);
-		// viewer.setInput(getViewSite());
-		viewer.setInput(model.getTypeElements().toArray());
-		viewer.refresh();
-		getSite().setSelectionProvider(viewer);
-		viewer.addSelectionChangedListener(this);
-		workloadControllers = getWorkloadControllers();
-		for (Action controller : workloadControllers) {
-			if (controller instanceof ISelectionChangedListener) {
-				viewer.addSelectionChangedListener((ISelectionChangedListener) controller);
-			}
-		}
-		model.addModelEventListener(this);
-		model.addModelChangedListener(eventListener);
-		makeActions();
-		hookContextMenu();
-		hookDoubleClickAction();
-		contributeToActionBars();
-
-		// Pack the window
-		parent.pack();
-
-		// Scroll to top
-		viewer.reveal(viewer.getTree().getItem(0));
-	}
-
-	private void defineTable(TreeViewer viewer) {
-		Tree t = viewer.getTree();
-		t.setHeaderVisible(true);
-
-		// 1st column with image/checkboxes - NOTE: The SWT.CENTER has no
-		// effect!!
-		TreeColumn column = new TreeColumn(t, SWT.LEFT, 0);
-		column.setText(ENVIRONMENT_CONTROL_NAME);
-		column.setWidth(650);
-
-		// 2nd column with task Description
-		column = new TreeColumn(t, SWT.RIGHT, 1);
-		column.setText(ENVIRONMENT_CONTROL_STATUS);
-		column.setWidth(50);
-
-		viewer.expandAll();
-
-		// Pack the columns
-		/*
-		 * for (int i = 0, n = t.getColumnCount(); i < n; i++) {
-		 * t.getColumn(i).pack(); }
-		 */
-		// Turn on the header and the lines
-		t.setHeaderVisible(true);
-		t.setLinesVisible(true);
-
-	}
-
-	private void hookContextMenu() {
-		MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
-		menuMgr.setRemoveAllWhenShown(true);
-		menuMgr.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager manager) {
-				ISelection selection = viewer.getSelection();
-				Object obj = ((IStructuredSelection) selection).getFirstElement();
-				if (obj != null) {
-					if (TargetElement.class.isAssignableFrom(obj.getClass())) {
-						// Edit
-						// Remove
-						createAction.setEnabled(false);
-
-						ITargetElement temp = (ITargetElement) obj;
-						if (temp.getStatus() == ITargetElementStatus.STOPPED) {
-							editAction.setEnabled(true);
-							removeAction.setEnabled(true);
-						} else {
-							editAction.setEnabled(false);
-							removeAction.setEnabled(false);
-						}
-						RemoteToolsEnvironmentView.this.fillContextMenu(manager);
-					} else if (TargetTypeElement.class.isAssignableFrom(obj.getClass())) {
-						// Create
-						createAction.setEnabled(true);
-						editAction.setEnabled(false);
-						removeAction.setEnabled(false);
-						RemoteToolsEnvironmentView.this.fillContextMenu(manager);
-					}
-				}
-			}
-		});
-		Menu menu = menuMgr.createContextMenu(viewer.getControl());
-		viewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(menuMgr, viewer);
-	}
-
-	private void contributeToActionBars() {
-		IActionBars bars = getViewSite().getActionBars();
-		fillLocalPullDown(bars.getMenuManager());
-		fillLocalToolBar(bars.getToolBarManager());
-	}
-
-	private void fillLocalPullDown(IMenuManager manager) {
-		// manager.add(action1);
-		// manager.add(new Separator());
-		// manager.add(action2);
-	}
-
-	private void fillContextMenu(IMenuManager manager) {
-		manager.add(createAction);
-		manager.add(editAction);
-		manager.add(removeAction);
-		// Other plug-ins can contribute there actions here
-		manager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-	}
-
-	private void fillLocalToolBar(IToolBarManager manager) {
-		// Other plug-ins can contribute there actions here
-		for (Action controller : workloadControllers) {
-			manager.add(controller);
-		}
-
-		manager.add(startAction);
-		manager.add(stopAction);
-		manager.add(resumeAction);
-		manager.add(pauseAction);
-	}
-
-	@SuppressWarnings("unchecked")
-	private List<Action> getWorkloadControllers() {
-
-		List<Action> actions = new ArrayList<Action>();
-
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
-		IExtensionPoint extensionPoint = registry
-				.getExtensionPoint("org.eclipse.ptp.remotetools.environment.ui.workloadController"); //$NON-NLS-1$
-		IExtension[] extensions = extensionPoint.getExtensions();
-
-		try {
-			for (int i = 0; i < extensions.length; i++) {
-				IExtension extension = extensions[i];
-				IConfigurationElement[] elements = extension.getConfigurationElements();
-				for (int j = 0; j < elements.length; j++) {
-					IConfigurationElement element = elements[j];
-					if ("controllerDelegate".equals(element.getName())) { //$NON-NLS-1$
-						actions.add((Action) element.createExecutableExtension("class")); //$NON-NLS-1$
-					}
-				}
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return actions.isEmpty() ? (List<Action>) Collections.EMPTY_LIST : actions;
-	}
-
-	public void refresh() {
-		final Display display = viewer.getControl().getDisplay();
-		display.asyncExec(new Runnable() {
-			public void run() {
-				if (!viewer.getControl().isDisposed())
-					viewer.refresh(true);
-			}
-		});
-	}
-
-	private void makeActions() {
-
-		URL url = UIEnvironmentPlugin.getDefault().getBundle().getEntry("/icons/run_exc.gif"); //$NON-NLS-1$
-		ImageDescriptor imageRun = ImageDescriptor.createFromURL(url);
-		url = UIEnvironmentPlugin.getDefault().getBundle().getEntry("/icons/terminatedlaunch.gif"); //$NON-NLS-1$
-		ImageDescriptor imageStop = ImageDescriptor.createFromURL(url);
-		url = UIEnvironmentPlugin.getDefault().getBundle().getEntry("/icons/suspend.gif"); //$NON-NLS-1$
-		ImageDescriptor imageSuspend = ImageDescriptor.createFromURL(url);
-		url = UIEnvironmentPlugin.getDefault().getBundle().getEntry("/icons/resume.gif"); //$NON-NLS-1$
-		ImageDescriptor imageResume = ImageDescriptor.createFromURL(url);
-
-		IWorkbenchPartSite site = this.getSite();
-		final Shell shell = site.getShell();
-
-		final IJobChangeListener ijob = new IJobChangeListener() {
-
-			public void aboutToRun(IJobChangeEvent event) {
-
-			}
-
-			public void awake(IJobChangeEvent event) {
-
-			}
-
-			public void done(IJobChangeEvent event) {
-				refresh();
-			}
-
-			public void running(IJobChangeEvent event) {
-
-			}
-
-			public void scheduled(IJobChangeEvent event) {
-
-			}
-
-			public void sleeping(IJobChangeEvent event) {
-
-			}
-		};
-
-		startAction = new Action() {
-			@Override
-			public void run() {
-				ISelection selection = viewer.getSelection();
-				final Object obj = ((IStructuredSelection) selection).getFirstElement();
-				if (obj != null) {
-					if (TargetElement.class.isAssignableFrom(obj.getClass())) {
-						Job job = new Job(Messages.RemoteToolsEnvironmentView_17) {
-							@Override
-							protected IStatus run(IProgressMonitor monitor) {
-
-								startAction.setEnabled(false);
-								IStatus status = null;
-								ITargetElement element = null;
-								ITargetControl control = null;
-
-								try {
-									element = (ITargetElement) obj;
-									control = element.getControl();
-									if (control.create(monitor))
-										status = Status.OK_STATUS;
-								} catch (CoreException e) {
-									status = e.getStatus();
-									startAction.setEnabled(true);
-								}
-
-								return status;
-							}
-						};
-						job.setUser(true);
-						job.schedule();
-						job.addJobChangeListener(ijob);
-						return;
-					}
-				}
-				showMessage(Messages.RemoteToolsEnvironmentView_18, viewer);
-			}
-		};
-		startAction.setText(Messages.RemoteToolsEnvironmentView_19);
-		startAction.setToolTipText(Messages.RemoteToolsEnvironmentView_20);
-		startAction.setImageDescriptor(imageRun);
-
-		stopAction = new Action() {
-			@Override
-			public void run() {
-
-				ISelection selection = viewer.getSelection();
-				final Object obj = ((IStructuredSelection) selection).getFirstElement();
-				if (obj != null) {
-					if (TargetElement.class.isAssignableFrom(obj.getClass())) {
-						Job job = new Job(Messages.RemoteToolsEnvironmentView_21) {
-							@Override
-							protected IStatus run(IProgressMonitor monitor) {
-
-								stopAction.setEnabled(false);
-								IStatus status = null;
-
-								try {
-									if (((ITargetElement) obj).getControl().kill(monitor))
-										status = Status.OK_STATUS;
-								} catch (CoreException e) {
-									status = e.getStatus();
-									stopAction.setEnabled(true);
-								}
-
-								return status;
-							}
-						};
-						job.setUser(true);
-						job.schedule();
-						job.addJobChangeListener(ijob);
-						return;
-					}
-				}
-				showMessage(Messages.RemoteToolsEnvironmentView_22, viewer);
-			}
-		};
-		stopAction.setText(Messages.RemoteToolsEnvironmentView_23);
-		stopAction.setToolTipText(Messages.RemoteToolsEnvironmentView_24);
-		stopAction.setImageDescriptor(imageStop);
-
-		// resume
-		resumeAction = new Action() {
-			@Override
-			public void run() {
-
-				ISelection selection = viewer.getSelection();
-				final Object obj = ((IStructuredSelection) selection).getFirstElement();
-
-				if (obj != null) {
-					if (TargetElement.class.isAssignableFrom(obj.getClass())) {
-						Job job = new Job(Messages.RemoteToolsEnvironmentView_25) {
-							@Override
-							protected IStatus run(IProgressMonitor monitor) {
-
-								resumeAction.setEnabled(false);
-								IStatus status = null;
-
-								try {
-									if (((ITargetElement) obj).getControl().resume(monitor)) {
-										status = Status.OK_STATUS;
-										pauseAction.setEnabled(true);
-									}
-								} catch (CoreException e) {
-									status = e.getStatus();
-									resumeAction.setEnabled(true);
-								}
-
-								return status;
-							}
-						};
-						job.setUser(true);
-						job.schedule();
-						job.addJobChangeListener(ijob);
-						return;
-					}
-				}
-				showMessage(Messages.RemoteToolsEnvironmentView_26, viewer);
-			}
-		};
-		resumeAction.setText(Messages.RemoteToolsEnvironmentView_27);
-		resumeAction.setToolTipText(Messages.RemoteToolsEnvironmentView_28);
-		resumeAction.setImageDescriptor(imageResume);
-
-		// stop
-		pauseAction = new Action() {
-			@Override
-			public void run() {
-
-				ISelection selection = viewer.getSelection();
-				final Object obj = ((IStructuredSelection) selection).getFirstElement();
-
-				if (obj != null) {
-					if (TargetElement.class.isAssignableFrom(obj.getClass())) {
-						Job job = new Job(Messages.RemoteToolsEnvironmentView_29) {
-							@Override
-							protected IStatus run(IProgressMonitor monitor) {
-
-								pauseAction.setEnabled(false);
-								IStatus status = null;
-
-								try {
-									if (((ITargetElement) obj).getControl().stop(monitor)) {
-										status = Status.OK_STATUS;
-										resumeAction.setEnabled(true);
-									}
-								} catch (CoreException e) {
-									status = e.getStatus();
-									pauseAction.setEnabled(true);
-								}
-
-								return status;
-							}
-						};
-						job.setUser(true);
-						job.schedule();
-						job.addJobChangeListener(ijob);
-						return;
-					}
-				}
-				showMessage(Messages.RemoteToolsEnvironmentView_30, viewer);
-			}
-		};
-		pauseAction.setText(Messages.RemoteToolsEnvironmentView_31);
-		pauseAction.setToolTipText(Messages.RemoteToolsEnvironmentView_32);
-		pauseAction.setImageDescriptor(imageSuspend);
-
-		// Create
-		createAction = new Action() {
-			@Override
-			public void run() {
-				ISelection selection = viewer.getSelection();
-				Object obj = ((IStructuredSelection) selection).getFirstElement();
-
-				if (TargetTypeElement.class.isAssignableFrom(obj.getClass())) {
-					EnvironmentWizard wizard = new EnvironmentWizard((TargetTypeElement) obj);
-					WizardDialog dialog = new WizardDialog(shell, wizard);
-					dialog.create();
-					dialog.setBlockOnOpen(true);
-					dialog.open();
-					/*
-					 * refresh handled by ITargetEnvironmentEventListener
-					 */
-				}
-
-			}
-		};
-		createAction.setText(Messages.RemoteToolsEnvironmentView_33);
-		createAction.setToolTipText(Messages.RemoteToolsEnvironmentView_34);
-
-		// Edit
-		editAction = new Action() {
-			@Override
-			public void run() {
-				ISelection selection = viewer.getSelection();
-				Object obj = ((IStructuredSelection) selection).getFirstElement();
-
-				if (TargetElement.class.isAssignableFrom(obj.getClass())) {
-					EnvironmentWizard wizard = new EnvironmentWizard((ITargetElement) obj);
-					WizardDialog dialog = new WizardDialog(shell, wizard);
-					dialog.create();
-					dialog.setBlockOnOpen(true);
-					dialog.open();
-					refresh();
-				}
-			}
-		};
-		editAction.setText(Messages.RemoteToolsEnvironmentView_35);
-		editAction.setToolTipText(Messages.RemoteToolsEnvironmentView_36);
-
-		// Remove
-		removeAction = new Action() {
-			@Override
-			public void run() {
-				ISelection selection = viewer.getSelection();
-				Object obj = ((IStructuredSelection) selection).getFirstElement();
-
-				if (TargetElement.class.isAssignableFrom(obj.getClass())) {
-					ITargetElement confElement = (ITargetElement) obj;
-					if (confElement.getStatus() != ITargetElementStatus.STARTED) {
-						if (showConfirm(Messages.RemoteToolsEnvironmentView_37, viewer)) {
-							confElement.getType().removeElement(confElement);
-							/*
-							 * refresh handled by
-							 * ITargetEnvironmentEventListener
-							 */
-						}
-					} else {
-						showMessage(Messages.RemoteToolsEnvironmentView_38, viewer);
-					}
-				}
-			}
-		};
-		removeAction.setText(Messages.RemoteToolsEnvironmentView_39);
-		removeAction.setToolTipText(Messages.RemoteToolsEnvironmentView_40);
-
-		doubleClickAction = new Action() {
-			@Override
-			public void run() {
-				ISelection selection = viewer.getSelection();
-				Object obj = ((IStructuredSelection) selection).getFirstElement();
-
-				if (TargetTypeElement.class.isAssignableFrom(obj.getClass())) {
-					if (viewer.getExpandedState(obj)) {
-						viewer.setExpandedState(obj, false);
-					} else
-						viewer.setExpandedState(obj, true);
-
-				}
-
-				if (TargetElement.class.isAssignableFrom(obj.getClass())) {
-					ITargetElement ele = (ITargetElement) obj;
-					try {
-						ITargetControl control = ele.getControl();
-						if (control.query() == ITargetElementStatus.STOPPED) {
-							editAction.run();
-						}
-					} catch (CoreException e) {
-						e.printStackTrace();
-					}
-				}
-
-				if (INode.class.isAssignableFrom(obj.getClass())) {
-					INode node = (INode) obj;
-					UIEnvironmentPlugin.getDefault().getDoubleClickHandlerManager().doubleClickExecute(node);
-				}
-
-				// showMessage("Double-click detected on "+obj.toString(),viewer);
-			}
-		};
-
-		stopAction.setEnabled(false);
-		resumeAction.setEnabled(false);
-		pauseAction.setEnabled(false);
-		createAction.setEnabled(false);
-		editAction.setEnabled(false);
-		removeAction.setEnabled(false);
-
-	}
-
-	private void hookDoubleClickAction() {
-		viewer.addDoubleClickListener(new IDoubleClickListener() {
-			public void doubleClick(DoubleClickEvent event) {
-				doubleClickAction.run();
-			}
-		});
-	}
-
-	private void showMessage(String message, TreeViewer viewer) {
-		MessageDialog.openInformation(viewer.getControl().getShell(), Messages.RemoteToolsEnvironmentView_41, message);
-	}
-
-	private boolean showConfirm(String message, TreeViewer viewer) {
-		return MessageDialog.openConfirm(viewer.getControl().getShell(), Messages.RemoteToolsEnvironmentView_42, message);
-	}
-
-	/**
-	 * Passing the focus request to the viewer's control.
-	 */
-	@Override
-	public void setFocus() {
-		viewer.getControl().setFocus();
-	}
-
-	public void selectionChanged(SelectionChangedEvent event) {
-		ISelection selection = event.getSelection();
-		Object obj = ((IStructuredSelection) selection).getFirstElement();
-
-		if (obj != null) {
-			if (TargetElement.class.isAssignableFrom(obj.getClass())) {
-				currentElement = (ITargetElement) obj;
-				switch (currentElement.getStatus()) {
-				case ITargetElementStatus.STARTED:
-					targetStarted(currentElement);
-					break;
-				case ITargetElementStatus.STOPPED:
-					targetStopped(currentElement);
-					break;
-				case ITargetElementStatus.RESUMED:
-					targetResumed(currentElement);
-					break;
-				case ITargetElementStatus.PAUSED:
-					targetPaused(currentElement);
-					break;
-				}
-			} else {
-				currentElement = null;
-				startAction.setEnabled(false); // Create
-				stopAction.setEnabled(false); // Kill
-				resumeAction.setEnabled(false); // Resume
-				pauseAction.setEnabled(false); // Pause
-			}
-		}
-	}
-
-	public void targetStarted(ITargetElement event) {
-
-		if (event != null && currentElement != null) {
-			if (event.equals(currentElement)) {
-				startAction.setEnabled(false); // Create
-				stopAction.setEnabled(true); // Kill
-				resumeAction.setEnabled(true); // Resume
-				pauseAction.setEnabled(false); // Pause
-				editAction.setEnabled(false);
-				removeAction.setEnabled(false);
-			}
-		}
-		this.refresh();
-
-	}
-
-	public void targetStopped(ITargetElement event) {
-
-		if (event != null && currentElement != null) {
-			if (event.equals(currentElement)) {
-				startAction.setEnabled(true); // Create
-				stopAction.setEnabled(false); // Kill
-				resumeAction.setEnabled(false); // Resume
-				pauseAction.setEnabled(false); // Pause
-				editAction.setEnabled(true);
-				removeAction.setEnabled(true);
-			}
-		}
-		this.refresh();
-
-	}
-
-	public void targetPaused(ITargetElement event) {
-
-		if (event != null && currentElement != null) {
-			if (event.equals(currentElement)) {
-				startAction.setEnabled(false); // Create
-				stopAction.setEnabled(true); // Kill
-				resumeAction.setEnabled(true); // Resume
-				pauseAction.setEnabled(false); // Pause
-
-			}
-		}
-		this.refresh();
-
-	}
-
-	public void targetResumed(ITargetElement event) {
-
-		if (event != null && currentElement != null) {
-			if (event.equals(currentElement)) {
-				startAction.setEnabled(false); // Create
-				stopAction.setEnabled(true); // Kill
-				resumeAction.setEnabled(false); // Resume
-				pauseAction.setEnabled(true); // Pause
-
-			}
-		}
-		this.refresh();
-
-	}
-
-	public void handleStateChangeEvent(int event, ITargetElement from) {
-
-		switch (event) {
-		case ITargetElementStatus.STARTED:
-			targetStarted(from);
-			break;
-		case ITargetElementStatus.STOPPED:
-			targetStopped(from);
-			break;
-		case ITargetElementStatus.RESUMED:
-			targetResumed(from);
-			break;
-		case ITargetElementStatus.PAUSED:
-			targetPaused(from);
-			break;
-		}
-
-	}
-
-	@Override
-	public void dispose() {
-		super.dispose();
-		model.removeModelEventListener(this);
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/.classpath b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/.classpath
deleted file mode 100755
index 64c5e31..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/.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/remotetools/org.eclipse.ptp.remotetools.preferences/.project b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/.project
deleted file mode 100755
index 68087de..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.remotetools.preferences</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/remotetools/org.eclipse.ptp.remotetools.preferences/.settings/org.eclipse.jdt.core.prefs b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 618b828..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,8 +0,0 @@
-#Fri Apr 16 13:00:13 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/remotetools/org.eclipse.ptp.remotetools.preferences/META-INF/MANIFEST.MF b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/META-INF/MANIFEST.MF
deleted file mode 100755
index 96f5105..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.remotetools.preferences;singleton:=true
-Bundle-Version: 1.3.1.qualifier
-Bundle-Activator: org.eclipse.ptp.remotetools.preferences.PreferencesPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.ptp.remotetools.preferences,
- org.eclipse.ptp.remotetools.preferences.events,
- org.eclipse.ptp.remotetools.preferences.ui
-Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/about.html b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/about.html
deleted file mode 100755
index a78242d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/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>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/build.properties b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/build.properties
deleted file mode 100755
index 2681e2d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/build.properties
+++ /dev/null

@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               about.html,\
-               plugin.properties

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/plugin.properties b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/plugin.properties
deleted file mode 100644
index 0c91414..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/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 Remote Tools Preferences
-pluginProvider=Eclipse.org

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/plugin.xml b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/plugin.xml
deleted file mode 100755
index 01b38f8..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/plugin.xml
+++ /dev/null

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            name="Remote Tools"
-            class="org.eclipse.ptp.remotetools.preferences.ui.TargetPreferencePage"
-            id="org.eclipse.ptp.remotetools.preferences.ui.RemoteToolsPreferencePage">
-      </page>
-      <page
-            category="org.eclipse.ptp.remotetools.preferences.ui.RemoteToolsPreferencePage"
-            class="org.eclipse.ptp.remotetools.preferences.ui.TargetEnvironmentPreferencePage"
-            id="org.eclipse.ptp.remotetools.preferences.ui.RemoteToolsPreferencePage.EnvironmentPreferencePage"
-            name="Environments"/>
-   </extension>
-   <extension
-         point="org.eclipse.core.runtime.preferences">
-      <initializer
-            class="org.eclipse.ptp.remotetools.preferences.ui.PreferenceInitializer">
-      </initializer>
-   </extension>
-
-</plugin>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/PreferencesPlugin.java b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/PreferencesPlugin.java
deleted file mode 100755
index 94b424a..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/PreferencesPlugin.java
+++ /dev/null

@@ -1,103 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.preferences;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.remotetools.preferences.events.IPreferencesChangeListener;
-import org.eclipse.ptp.remotetools.preferences.events.PreferencesChangeEvent;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- * 
- * @author Ricardo M. Matinata
- * @since 1.1
- */
-public class PreferencesPlugin extends AbstractUIPlugin {
-
-	// The shared instance.
-	private static PreferencesPlugin plugin;
-
-	private final List propertiesListeners;
-
-	private Preferences.IPropertyChangeListener propertyListener;
-
-	/**
-	 * The constructor.
-	 */
-	public PreferencesPlugin() {
-		plugin = this;
-		propertiesListeners = new ArrayList();
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		propertyListener = new Preferences.IPropertyChangeListener() {
-
-			public void propertyChange(Preferences.PropertyChangeEvent event) {
-
-				fireValueChanged(event.getProperty(), event.getOldValue(), event.getNewValue());
-
-			}
-
-		};
-		this.getPluginPreferences().addPropertyChangeListener(propertyListener);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		this.getPluginPreferences().removePropertyChangeListener(propertyListener);
-		this.savePluginPreferences();
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static PreferencesPlugin getDefault() {
-		return plugin;
-	}
-
-	public void addListener(IPreferencesChangeListener listener) {
-
-		propertiesListeners.add(listener);
-	}
-
-	public void removeListener(IPreferencesChangeListener listener) {
-
-		propertiesListeners.remove(listener);
-	}
-
-	public void fireValueChanged(String property, Object oldValue, Object newValue) {
-		if (propertiesListeners.size() == 0)
-			return;
-		Iterator i = propertiesListeners.iterator();
-
-		while (i.hasNext()) {
-			IPreferencesChangeListener listener = (IPreferencesChangeListener) i.next();
-			listener.propertyChange(new PreferencesChangeEvent(this, property, oldValue, newValue));
-		}
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/events/FollowBeginStringFieldEditorPropertyChangeListener.java b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/events/FollowBeginStringFieldEditorPropertyChangeListener.java
deleted file mode 100755
index 8846fea..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/events/FollowBeginStringFieldEditorPropertyChangeListener.java
+++ /dev/null

@@ -1,109 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.preferences.events;
-
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.StringFieldEditor;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @author laggarcia
- * @since 3.0.0
- */
-public class FollowBeginStringFieldEditorPropertyChangeListener implements
-		IPropertyChangeListener {
-
-	protected StringFieldEditor stringFieldEditor;
-
-	protected Text textControl;
-
-	protected IPreferenceStore preferenceStore;
-
-	protected String preferenceName;
-
-	protected Display display;
-
-	/**
-	 * 
-	 */
-	public FollowBeginStringFieldEditorPropertyChangeListener(
-			StringFieldEditor stringFieldEditor, Composite parent) {
-		this.stringFieldEditor = stringFieldEditor;
-		this.textControl = stringFieldEditor.getTextControl(parent);
-		this.display = this.textControl.getDisplay();
-		this.preferenceStore = stringFieldEditor.getPreferenceStore();
-		this.preferenceName = stringFieldEditor.getPreferenceName();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.Preferences.IPropertyChangeListener#propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent)
-	 */
-	public void propertyChange(PropertyChangeEvent event) {
-		final String oldValue = (String) event.getOldValue(); // old value for
-																// the property
-																// being
-																// monitored
-		final String newValue = (String) event.getNewValue(); // new value for
-																// the property
-																// being
-																// monitored
-		// Update the value in the GUI or in the preference store, which one is
-		// active
-		if (this.display != null) {
-			this.display.asyncExec(new Runnable() {
-				public void run() {
-					String stringValue;
-					String stringNewValue;
-					if (!FollowBeginStringFieldEditorPropertyChangeListener.this.textControl
-							.isDisposed()) {
-						stringValue = FollowBeginStringFieldEditorPropertyChangeListener.this.stringFieldEditor
-								.getStringValue();
-						if (stringValue.startsWith(oldValue)) {
-							stringNewValue = stringValue.replaceFirst(oldValue,
-									newValue);
-							FollowBeginStringFieldEditorPropertyChangeListener.this.stringFieldEditor
-									.setStringValue(stringNewValue);
-						}
-					} else {
-						stringValue = FollowBeginStringFieldEditorPropertyChangeListener.this.preferenceStore
-								.getString(FollowBeginStringFieldEditorPropertyChangeListener.this.preferenceName);
-						if (stringValue.startsWith(oldValue)) {
-							stringNewValue = stringValue.replaceFirst(oldValue,
-									newValue);
-							FollowBeginStringFieldEditorPropertyChangeListener.this.preferenceStore
-									.setValue(
-											FollowBeginStringFieldEditorPropertyChangeListener.this.preferenceName,
-											stringNewValue);
-						}
-					}
-				}
-			});
-		} else {
-			String stringValue = FollowBeginStringFieldEditorPropertyChangeListener.this.preferenceStore
-					.getString(FollowBeginStringFieldEditorPropertyChangeListener.this.preferenceName);
-			if (stringValue.startsWith(oldValue)) {
-				String stringNewValue = stringValue.replaceFirst(oldValue,
-						newValue);
-				FollowBeginStringFieldEditorPropertyChangeListener.this.preferenceStore
-						.setValue(
-								FollowBeginStringFieldEditorPropertyChangeListener.this.preferenceName,
-								stringNewValue);
-			}
-		}
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/events/IPreferencesChangeListener.java b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/events/IPreferencesChangeListener.java
deleted file mode 100644
index e48b25c..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/events/IPreferencesChangeListener.java
+++ /dev/null

@@ -1,35 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.preferences.events;
-
-import java.util.EventListener;
-
-
-/**
- * 
- * @author Ricardo M. Matinata
- * @since 1.0
- */
-public interface IPreferencesChangeListener extends EventListener {
-
-	/**
-	 * Notification that a property has changed.
-	 * <p>
-	 * This method gets called when the observed object fires a property
-	 * change event.
-	 * </p>
-	 *
-	 * @param event the property change event object describing which
-	 *    property changed and how
-	 */
-	public void propertyChange(PreferencesChangeEvent event);
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/events/PreferencesChangeEvent.java b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/events/PreferencesChangeEvent.java
deleted file mode 100644
index 3c4c9c6..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/events/PreferencesChangeEvent.java
+++ /dev/null

@@ -1,101 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.preferences.events;
-
-import java.util.EventObject;
-
-
-/**
- * 
- * @author Ricardo M. Matinata
- * @since 1.0
- */
-public class PreferencesChangeEvent extends EventObject {
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 4835020254788026229L;
-
-	/**
-	 * The name of the changed property.
-	 */
-	private String propertyName;
-
-	/**
-	 * The old value of the changed property, or <code>null</code> if
-	 * not known or not relevant.
-	 */
-	private Object oldValue;
-
-	/**
-	 * The new value of the changed property, or <code>null</code> if
-	 * not known or not relevant.
-	 */
-	private Object newValue;
-
-	/**
-	 * Creates a new property change event.
-	 *
-	 * @param source the object whose property has changed
-	 * @param property the property that has changed (must not be 
-	 *    <code>null</code>)
-	 * @param oldValue the old value of the property, or 
-	 *    <code>null</code> if none
-	 * @param newValue the new value of the property, or 
-	 *    <code>null</code> if none
-	 */
-	public PreferencesChangeEvent(Object source, String property, Object oldValue, Object newValue) {
-		super(source);
-		if (property == null) {
-			throw new IllegalArgumentException();
-		}
-		this.propertyName = property;
-		this.oldValue = oldValue;
-		this.newValue = newValue;
-	}
-
-	/**
-	 * Returns the name of the property that changed.
-	 * <p>
-	 * Warning: there is no guarantee that the property name returned
-	 * is a constant string.  Callers must compare property names using
-	 * <code>equals</code>, not ==.
-	 *</p>
-	 * 
-	 * @return the name of the property that changed
-	 */
-	public String getProperty() {
-		return propertyName;
-	}
-
-	/**
-	 * Returns the new value of the property.
-	 *
-	 * @return the new value, or <code>null</code> if not known
-	 *  or not relevant
-	 */
-	public Object getNewValue() {
-		return newValue;
-	}
-
-	/**
-	 * Returns the old value of the property.
-	 *
-	 * @return the old value, or <code>null</code> if not known
-	 *  or not relevant
-	 */
-	public Object getOldValue() {
-		return oldValue;
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/messages/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/messages/Messages.java
deleted file mode 100644
index eae7723..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/messages/Messages.java
+++ /dev/null

@@ -1,16 +0,0 @@
-package org.eclipse.ptp.remotetools.preferences.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remotetools.preferences.messages.messages"; //$NON-NLS-1$
-	public static String TargetEnvironmentPreferencePage_0;
-	public static String TargetPreferencePage_0;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/messages/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/messages/messages.properties
deleted file mode 100644
index def0416..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/messages/messages.properties
+++ /dev/null

@@ -1,2 +0,0 @@
-TargetEnvironmentPreferencePage_0=Target Environment Preferences
-TargetPreferencePage_0=Remote Tools preferences

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/AbstractBaseFieldEditorPreferencePage.java b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/AbstractBaseFieldEditorPreferencePage.java
deleted file mode 100755
index 5f9984d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/AbstractBaseFieldEditorPreferencePage.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.preferences.ui;
-
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-/**
- * 
- * @author Ricardo M. Matinata
- * @since 1.0
- */
-public abstract class AbstractBaseFieldEditorPreferencePage extends
-		FieldEditorPreferencePage implements IWorkbenchPreferencePage {
-
-	public AbstractBaseFieldEditorPreferencePage(int style) {
-		super(style);
-	}
-
-	public AbstractBaseFieldEditorPreferencePage(String title, int style) {
-		super(title, style);
-
-	}
-
-	public AbstractBaseFieldEditorPreferencePage(String title,
-			ImageDescriptor image, int style) {
-		super(title, image, style);
-
-	}
-
-	protected void createFieldEditors() {
-
-
-	}
-
-	public void init(IWorkbench workbench) {
-
-	}
-	
-	public void propertyChange(PropertyChangeEvent event) {
-		super.propertyChange(event);
-		
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/AbstractBasicPreferencePage.java b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/AbstractBasicPreferencePage.java
deleted file mode 100755
index 31b0848..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/AbstractBasicPreferencePage.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.preferences.ui;
-
-import org.eclipse.jface.preference.*;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.IWorkbench;
-
-/**
- * 
- * @author Ricardo M. Matinata
- * @since 1.0
- */
-
-public class AbstractBasicPreferencePage
-	extends PreferencePage
-	implements IWorkbenchPreferencePage {
-
-	public AbstractBasicPreferencePage() {
-		super();
-		noDefaultAndApplyButton();
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
-	 */
-	public void init(IWorkbench workbench) {
-	}
-
-	protected Control createContents(Composite parent) {
-		
-		return parent;
-	}
-	
-}
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/LabelFieldEditor.java b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/LabelFieldEditor.java
deleted file mode 100755
index 8a22362..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/LabelFieldEditor.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.preferences.ui;
-
-import org.eclipse.jface.preference.FieldEditor;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-
-/**
- * A field editor for displaying labels not associated with other widgets.
- * 
- * @author Ricardo M. Matinata
- * @since 1.0
- */
-public class LabelFieldEditor extends FieldEditor {
-
-	private Label label;
-
-	public LabelFieldEditor(String value, Composite parent) {
-		super("label", value, parent); //$NON-NLS-1$
-	}
-
-	protected void adjustForNumColumns(int numColumns) {
-		((GridData) label.getLayoutData()).horizontalSpan = numColumns;
-	}
-
-	protected void doFillIntoGrid(Composite parent, int numColumns) {
-		label = getLabelControl(parent);
-		
-		GridData gridData = new GridData();
-		gridData.horizontalSpan = numColumns;
-		gridData.horizontalAlignment = GridData.FILL;
-		gridData.grabExcessHorizontalSpace = false;
-		gridData.verticalAlignment = GridData.CENTER;
-		gridData.grabExcessVerticalSpace = false;
-		
-		label.setLayoutData(gridData);
-	}
-
-	public int getNumberOfControls() {
-		return 1;
-	}
-
-	protected void doLoad() {
-	}
-	protected void doLoadDefault() {
-	}
-	protected void doStore() {
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PluginResources.properties b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PluginResources.properties
deleted file mode 100755
index e8d39b0..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PluginResources.properties
+++ /dev/null

@@ -1,12 +0,0 @@
-###############################################################################
-# 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
-# 
-# Contributors:
-#     IBM Corporation - initial implementation
-###############################################################################
-searchButtonText=Find it!
-searchEngineInformationTitle="Search engine information"
\ No newline at end of file

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PreferenceConstants.java b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PreferenceConstants.java
deleted file mode 100755
index 0006932..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PreferenceConstants.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.preferences.ui;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ptp.remotetools.preferences.PreferencesPlugin;
-
-
-/**
- * Constant definitions for plug-in preferences
- * 
- * @author Ricardo M. Matinata
- * @since 1.0
- */
-public class PreferenceConstants {
-
-	//keys
-	public static final String TIMING_SPUBIN = "timing-spubin"; //$NON-NLS-1$
-		
-	private IPreferenceStore preferences = null;
-	private static PreferenceConstants instance = null;
-
-	public PreferenceConstants() {
-		super();
-		preferences = PreferencesPlugin.getDefault().getPreferenceStore();
-	}
-	
-	public static PreferenceConstants getInstance() {
-		if (instance == null)
-			instance = new PreferenceConstants();
-		return instance;
-	}
-	
-	public IPath getTIMING_SPUBIN() {
-		return new Path(preferences.getString(TIMING_SPUBIN));
-	}
-	
-	public IPath getDefaultTIMING_SPUBIN() {
-		return new Path("spu_timing"); //$NON-NLS-1$
-	}
-	
-	public void setTIMING_SPUBIN(IPath value) {
-		preferences.setValue(TIMING_SPUBIN, value.toOSString());
-		PreferencesPlugin.getDefault().savePluginPreferences();
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PreferenceConstantsFromFile.java b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PreferenceConstantsFromFile.java
deleted file mode 100755
index cb0a07c..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PreferenceConstantsFromFile.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.preferences.ui;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author Richard Maciel
- *
- * @since 1.2.3
- */
-public class PreferenceConstantsFromFile extends NLS
-{
-	private static final String BUNDLE_ID = "org.eclipse.ptp.remotetools.preferences.PluginResources"; //$NON-NLS-1$
-	
-	public static String TIMING_SPUBIN_VALUE;
-	
-	public static String searchButtonText;
-	
-	public static String searchEngineInformationTitle;
-	
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_ID, PreferenceConstantsFromFile.class);
-	}
-
-	private PreferenceConstantsFromFile() {
-		// cannot create new instance
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PreferenceInitializer.java b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PreferenceInitializer.java
deleted file mode 100755
index 70023a4..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/PreferenceInitializer.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.preferences.ui;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ptp.remotetools.preferences.PreferencesPlugin;
-
-import org.eclipse.ptp.remotetools.preferences.ui.PreferenceConstants;
-import org.eclipse.ptp.remotetools.preferences.ui.PreferenceConstantsFromFile;
-
-/**
- * Class used to initialize default preference values.
- * 
- * @author Ricardo M. Matinata, Richard Maciel
- * @since 1.0
- */
-public class PreferenceInitializer extends AbstractPreferenceInitializer {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
-	 */
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = PreferencesPlugin.getDefault()
-				.getPreferenceStore();
-		PreferenceConstants prefs = PreferenceConstants.getInstance();
-		store.setDefault(PreferenceConstants.TIMING_SPUBIN,PreferenceConstantsFromFile.TIMING_SPUBIN_VALUE);
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/SpacerFieldEditor.java b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/SpacerFieldEditor.java
deleted file mode 100755
index e7f4d7f..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/SpacerFieldEditor.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.preferences.ui;
-
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * A field editor for adding space to a preference page.
- * 
- * @author Ricardo M. Matinata
- * @since 1.0
- */
-public class SpacerFieldEditor extends LabelFieldEditor {
-	
-	public SpacerFieldEditor(Composite parent) {
-		super("", parent); //$NON-NLS-1$
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/TargetEnvironmentPreferencePage.java b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/TargetEnvironmentPreferencePage.java
deleted file mode 100644
index fc06b85..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/TargetEnvironmentPreferencePage.java
+++ /dev/null

@@ -1,30 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.preferences.ui;
-
-import org.eclipse.ptp.remotetools.preferences.messages.Messages;
-
-
-/**
- * 
- * @author Ricardo M. Matinata
- * @since 1.0
- */
-public class TargetEnvironmentPreferencePage extends AbstractBasicPreferencePage {
-	
-	public TargetEnvironmentPreferencePage() {
-		super();
-		setDescription(Messages.TargetEnvironmentPreferencePage_0);
-	}
-
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/TargetPreferencePage.java b/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/TargetPreferencePage.java
deleted file mode 100644
index 03aede7..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.preferences/src/org/eclipse/ptp/remotetools/preferences/ui/TargetPreferencePage.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/**
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.remotetools.preferences.ui;
-
-import org.eclipse.ptp.remotetools.preferences.messages.Messages;
-
-
-/**
- * This class represents a preference page that
- * is contributed to the Preferences dialog.
- * 
- * @author Ricardo M. Matinata
- * @since 1.0
- */
-public class TargetPreferencePage
-	extends AbstractBasicPreferencePage{
-
-	public TargetPreferencePage() {
-		super();
-		setDescription(Messages.TargetPreferencePage_0);
-	}
-	
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/.classpath b/tools/remotetools/org.eclipse.ptp.remotetools.utils/.classpath
deleted file mode 100755
index 64c5e31..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/.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/remotetools/org.eclipse.ptp.remotetools.utils/.project b/tools/remotetools/org.eclipse.ptp.remotetools.utils/.project
deleted file mode 100755
index 898adff..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.remotetools.utils</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/remotetools/org.eclipse.ptp.remotetools.utils/.settings/org.eclipse.jdt.core.prefs b/tools/remotetools/org.eclipse.ptp.remotetools.utils/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c7ffed6..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,8 +0,0 @@
-#Fri Apr 16 13:01:32 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/remotetools/org.eclipse.ptp.remotetools.utils/META-INF/MANIFEST.MF b/tools/remotetools/org.eclipse.ptp.remotetools.utils/META-INF/MANIFEST.MF
deleted file mode 100755
index 11eec84..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.remotetools.utils
-Bundle-Version: 3.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.remotetools.utils.UtilsPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ui.console,
- org.eclipse.core.filesystem,
- org.eclipse.core.resources,
- org.eclipse.swt,
- org.eclipse.jface,
- org.eclipse.ui
-Bundle-ActivationPolicy: lazy
-Export-Package: 
- org.eclipse.ptp.remotetools.utils,
- org.eclipse.ptp.remotetools.utils.network,
- org.eclipse.ptp.remotetools.utils.stream
-Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/about.html b/tools/remotetools/org.eclipse.ptp.remotetools.utils/about.html
deleted file mode 100755
index a78242d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/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>

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/build.properties b/tools/remotetools/org.eclipse.ptp.remotetools.utils/build.properties
deleted file mode 100755
index d944674..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/build.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               plugin.properties

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/plugin.properties b/tools/remotetools/org.eclipse.ptp.remotetools.utils/plugin.properties
deleted file mode 100644
index da055d5..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/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 Remote Tools Utilities
-pluginProvider=Eclipse.org

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/UtilsPlugin.java b/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/UtilsPlugin.java
deleted file mode 100755
index 3ebdf0f..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/UtilsPlugin.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.utils;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plug-in class to be used in the desktop.
- */
-public class UtilsPlugin extends Plugin {
-
-	//private static final String PLUGIN_ID = "org.eclipse.ptp.remotetools.utils"; //$NON-NLS-1$
-	
-	//The shared instance.
-	private static UtilsPlugin plugin;
-	
-	/**
-	 * The constructor.
-	 */
-	public UtilsPlugin() {
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/*public static String getUniqueIdentifier() {
-		if (plugin == null) {
-			// If the default instance is not yet initialized,
-			// return a static identifier.
-			return PLUGIN_ID;
-		}
-		return plugin.getBundle().getSymbolicName();
-	}*/
-	
-	/**
-	 * Returns the shared instance.
-	 */
-	public static UtilsPlugin getDefault() {
-		return plugin;
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/messages/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/messages/Messages.java
deleted file mode 100644
index 825477d..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/messages/Messages.java
+++ /dev/null

@@ -1,24 +0,0 @@
-package org.eclipse.ptp.remotetools.utils.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.remotetools.utils.messages.messages"; //$NON-NLS-1$
-	public static String StreamObserver_0;
-	public static String StreamObserver_1;
-	public static String StreamObserver_2;
-	public static String StreamObserver_3;
-	public static String StreamObserver_4;
-	public static String StreamObserver_5;
-	public static String TextStreamObserver_0;
-	public static String TextStreamObserver_1;
-	public static String TextStreamObserver_2;
-	public static String TextStreamObserver_3;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/messages/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/messages/messages.properties
deleted file mode 100644
index f133bc0..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/messages/messages.properties
+++ /dev/null

@@ -1,10 +0,0 @@
-StreamObserver_0=Stream closed
-StreamObserver_1=Recovered from exception: 
-StreamObserver_2=Received: 
-StreamObserver_3=\ bytes
-StreamObserver_4=Started observing
-StreamObserver_5=Finished observing
-TextStreamObserver_0=Received: 
-TextStreamObserver_1=\ bytes
-TextStreamObserver_2=Stream closed
-TextStreamObserver_3=Recovered from exception: 

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/MacAddress.java b/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/MacAddress.java
deleted file mode 100755
index 2431b8b..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/MacAddress.java
+++ /dev/null

@@ -1,134 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.utils.network;
-
-import java.math.BigInteger;
-
-/**
- * Class that represents a 
- * 
- * @author Richard Maciel
- * @since 3.0
- */
-public class MacAddress {
-	public static int MAX_BITS = 48;
-	public static int HEXDIGITS = MAX_BITS/4;
-	public static int HEXBASE = 16;
-	
-	BigInteger mac;
-	
-	private MacAddress() {
-	}
-	
-	/**
-	 * Creatre a MacAddress from a {@link String}.
-	 * 
-	 * If the string is not in the XX:XX:XX:XX:XX:XX format, where XX is two hexadecimal digits, then
-	 * a MacAddressFormatException is raised.
-	 * 
-	 * @param macString
-	 * @return
-	 * @throws MacAddressFormatException
-	 */
-	public static MacAddress createMacAddress(String macString) throws MacAddressFormatException {
-		MacAddress maddr = new MacAddress();
-		maddr.mac = convertStringToInternalRepresentation(macString);
-		
-		return maddr;
-	}
-	
-	/**
-	 * Create a Mac Address from a {@link BigInteger}.
-	 * 
-	 * If the number is negative, it will be converted to a positive one.
-	 * If the number cannot be represented with MAX_BITS, then get the MAX_BITS least significant bits
-	 *  
-	 * @param macNumber
-	 */
-	public static MacAddress createMacAddress(BigInteger macNumber) {
-		MacAddress maddr = new MacAddress();
-		maddr.mac  = convertBigIntegerToInternalRepresentation(macNumber);
-		
-		return maddr;
-	}
-
-	private static BigInteger convertBigIntegerToInternalRepresentation(BigInteger macNumber) {
-		if(macNumber.signum() < 0) {
-//			 macNumber cannot be negative. Set it to a positive number
-			macNumber = macNumber.negate();
-		} 
-		
-		if(macNumber.bitLength() > MAX_BITS) { 
-//			 Mac number cannot be greater than 2 ^48, then convert to a 48 bit number
-			String bigMacStr = macNumber.toString(HEXBASE); 
-			String macStr = bigMacStr.substring(bigMacStr.length()-1 - HEXDIGITS, bigMacStr.length() - 1);
-			macNumber = new BigInteger(macStr);
-		}
-		return macNumber;
-	}
-
-	private static BigInteger convertStringToInternalRepresentation(String macString) throws MacAddressFormatException {
-		String trimmedMacString = macString.trim(); 
-		boolean isValidMac = trimmedMacString.matches("^(\\p{XDigit}{2}:){5}\\p{XDigit}{2}$"); //$NON-NLS-1$
-		
-		if(!isValidMac) {
-			throw new MacAddressFormatException(Messages.MacAddress_InvalidMACAddressFormat);
-		}
-		// Remove all ':' from the String
-		String validMacString = trimmedMacString.replaceAll(":", ""); //replace(':', '\0');  //$NON-NLS-1$//$NON-NLS-2$
-		
-		// Convert to the internal representation
-		return new BigInteger(validMacString, HEXBASE);
-		
-	}
-	
-	public void setValue(BigInteger macNumber) {
-		mac = MacAddress.convertBigIntegerToInternalRepresentation(macNumber);
-	}
-	
-	public void setValue(String macString) throws MacAddressFormatException {
-		mac = convertStringToInternalRepresentation(macString);
-	}
-	
-	public BigInteger getBigIntegerRepresentation() {
-		return mac;
-	}
-	
-	/**
-	 * Return a string representation of the mac address
-	 * 
-	 * @return String containing the mac address representation
-	 */
-	public String getStringRepresentation() {
-		String strRep = mac.toString(HEXBASE);
-		
-//		 Add the 0 at the left to complete the string.
-		if(strRep.length() < HEXDIGITS) {
-			
-			StringBuffer zeroStr =  new StringBuffer();
-			
-			for(int i=0; i < (HEXDIGITS - strRep.length()); i++) {
-				zeroStr.append("0"); //$NON-NLS-1$
-			}
-			strRep = new String(zeroStr + strRep);
-		}
-		
-		// For each pair of character, add a : character, except for the last one
-		StringBuffer hexRep = new StringBuffer();
-		for(int i=0; i < HEXDIGITS - 2; i = i + 2) {
-			hexRep.append(strRep.substring(i, i+2) + ":"); //$NON-NLS-1$
-		}
-		hexRep.append(strRep.substring(HEXDIGITS-2, HEXDIGITS));
-		
-		return hexRep.toString();
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/MacAddressFormatException.java b/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/MacAddressFormatException.java
deleted file mode 100755
index 5a57406..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/MacAddressFormatException.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.utils.network;
-
-/**
- * @author Richard Maciel
- * @since 3.0
- */
-public class MacAddressFormatException extends Exception {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 9098093943130065515L;
-
-	public MacAddressFormatException(String errorMsg) {
-		super(errorMsg);
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/Messages.java b/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/Messages.java
deleted file mode 100644
index 05ef360..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/Messages.java
+++ /dev/null

@@ -1,15 +0,0 @@
-package org.eclipse.ptp.remotetools.utils.network;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.cell.utils.network.messages"; //$NON-NLS-1$
-	public static String MacAddress_InvalidMACAddressFormat;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/messages.properties b/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/messages.properties
deleted file mode 100644
index 1d5df14..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/network/messages.properties
+++ /dev/null

@@ -1,11 +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
-###############################################################################
-MacAddress_InvalidMACAddressFormat=Invalid Mac Address format\!

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/ILineStreamListener.java b/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/ILineStreamListener.java
deleted file mode 100755
index 40933da..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/ILineStreamListener.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.utils.stream;
-
-/**
- * A listener that is called when an entire line is read from a stream.
- * A ILineStreamListener is an entity that can receive one line of text at time.
- * 
- * @author Daniel Felix Ferber
- * @since 1.0
- */
-public interface ILineStreamListener {
-	void newLine(String line);
-	void streamClosed();
-	void streamError(Exception e);
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/IStreamListener.java b/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/IStreamListener.java
deleted file mode 100755
index f002f57..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/IStreamListener.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-
-package org.eclipse.ptp.remotetools.utils.stream;
-
-
-/**
- * A listener that is called when some chunk of data is received from a stream.
- * A IStreamListener is an entity that can receive one chunk at time.
- * 
- * @author Daniel Felix Ferber
- * @since 1.0
- */
-public interface IStreamListener {
-	void newBytes(byte bytes[], int length);
-	void streamClosed();
-	void streamError(Exception e);
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/ListenedOutputStream.java b/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/ListenedOutputStream.java
deleted file mode 100755
index 55d9b98..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/ListenedOutputStream.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-package org.eclipse.ptp.remotetools.utils.stream;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-public class ListenedOutputStream extends OutputStream {
-
-	private IStreamListener listener;
-
-	public ListenedOutputStream(IStreamListener listener) {
-		this.listener = listener;
-	}
-	
-	public void write(byte[] b, int off, int len) throws IOException {
-		byte [] bytes = new byte[len];
-		System.arraycopy(b, off, bytes, 0, len);
-		listener.newBytes(bytes, len);
-	}
-
-	public void write(byte[] b) throws IOException {
-		listener.newBytes(b, b.length);
-	}
-
-	public void write(int b) throws IOException {
-		byte [] bytes = new byte[1];
-		bytes[0] = (byte) b;
-		listener.newBytes(bytes, bytes.length);
-	}
-
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/StreamBridge.java b/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/StreamBridge.java
deleted file mode 100755
index f24e775..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/StreamBridge.java
+++ /dev/null

@@ -1,93 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-
-package org.eclipse.ptp.remotetools.utils.stream;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * Connects an inputstream to an outputstream.
- * <p>
- * This is a general facility that allows to forward data received from an
- * inputstream to an outputstream.
- * <p>
- * An example would be to forward automatically data received from a socket
- * inputstream to a file outputstream.
- * <p>
- * Do not forget to call run() method!
- * 
- * @author Daniel Felix Ferber
- * @since 1.0
- */
-public class StreamBridge  {
-	/*
-	 * TODO: Open issues
-	 * - Handle exceptions
-	 */
-	IStreamListener dataForwarder = null;
-	StreamObserver streamObserver = null;
-	
-	private class DataForwarder implements IStreamListener {
-		OutputStream output;
-		StreamBridge bridge;
-
-		public DataForwarder(StreamBridge bridge, OutputStream output) {
-			this.output = output;
-			this.bridge = bridge;
-		}
-
-		public void newBytes(byte[] bytes, int length) {
-			try {
-				output.write(bytes, 0, length);
-			} catch (IOException e) {
-				// TODO Handle exception
-				bridge.kill();
-			}
-		}
-
-		public void newChars(char[] chars, int length) {
-		}
-
-		public void streamClosed() {
-			bridge.kill();
-		}
-
-		public void streamError(Exception e) {	
-			// TODO Handle exception
-			bridge.kill();
-		}
-	}
-
-	public StreamBridge(InputStream input, OutputStream output, String name) {
-		dataForwarder = new DataForwarder(this, output);
-		streamObserver = new StreamObserver(input, dataForwarder, name);
-	}
-
-	public StreamBridge(InputStream input, OutputStream output) {
-		dataForwarder = new DataForwarder(this, output);
-		streamObserver = new StreamObserver(input, dataForwarder);
-	}
-
-	public void kill() {
-		if (streamObserver != null) {
-			streamObserver.kill();
-		}
-		dataForwarder = null;
-		streamObserver = null;
-	}
-	
-	public void run() {
-		streamObserver.start();
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/StreamObserver.java b/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/StreamObserver.java
deleted file mode 100755
index 3936798..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/StreamObserver.java
+++ /dev/null

@@ -1,146 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-
-package org.eclipse.ptp.remotetools.utils.stream;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.ptp.remotetools.utils.messages.Messages;
-
-/**
- * Connects an inputstream to a stream listener.
- * <p>
- * This is a general facility that allows to forward data received from an
- * inputstream to a listener object. Note that only one listener is connected
- * to the observer.
- * 
- * @author Daniel Felix Ferber
- * @since 1.0
- */
-public class StreamObserver extends Thread {
-	/*
-	 * TODO: Open issues 
-	 * - Does access to 'killed' attribute need synchronized access?
-	 * - On sockets, often one byte is read one after the other, instead of
-	 *   blocks of bytes. Maybe adding some delay might force to read
-	 *   more than one byte.
-	 */
-	/**
-	 * Stream that is been observed and read.
-	 */
-	private InputStream input;
-
-	/**
-	 * Signals that bridge should stop.
-	 */
-	private boolean killed;
-
-	/**
-	 * Name to identify bridge when debugging.
-	 */
-	private String name;
-
-	/**
-	 * Listener that is called when data is received.
-	 */
-	private IStreamListener listener;
-
-	static final int BUFFER_SIZE = 100;
-
-	public StreamObserver(InputStream input, IStreamListener listener,
-			String name) {
-		this.name = name;
-		this.input = input;
-		this.listener = listener;
-		setName(name);
-	}
-
-	public StreamObserver(InputStream input, IStreamListener listener) {
-		this.name = this.getClass().getName();
-		this.input = input;
-		this.listener = listener;
-		setName(name);
-	}
-
-	/**
-	 * Stop observing data and terminate thread.
-	 */
-	public synchronized void kill() {
-		killed = true;
-	}
-	
-	void log(String s) {
-//		System.err.println(name + ": " + s);
-	}
-	
-	void streamClosed() {
-		log(Messages.StreamObserver_0);
-		listener.streamClosed();
-	}
-	
-	void streamError(Exception e) {
-		log(Messages.StreamObserver_1 + e.getMessage());
-		listener.streamError(e);
-	}
-	
-	void newBytes(byte buffer[], int length) {
-		log(Messages.StreamObserver_2 + Integer.toString(length) + Messages.StreamObserver_3);
-		listener.newBytes(buffer, length);		
-	}
-
-	/**
-	 * Run in background.
-	 */
-	public void run() {
-		byte buffer[] = new byte[250];
-		log(Messages.StreamObserver_4);
-		while (!killed) {
-			try {
-				int bytes = input.read(buffer);
-				if (bytes > 0) {
-					newBytes(buffer, bytes);
-				} else if (bytes == -1) {
-					streamClosed();
-					break;
-				}
-			} catch (IOException e) {
-				if (killed) {
-					streamClosed();
-					break;
-				}
-				if (e instanceof EOFException) {
-					streamClosed();
-					break;
-				} else {
-					streamError(e);
-					break;
-				}
-			} catch (NullPointerException e) {
-				/*
-				 * When the stream is closed, Java may raise a
-				 * NullPointerException. This case is handled like a
-				 * IOException, as above.
-				 */
-				if (killed) {
-					streamClosed();
-					break;
-				} else {
-					streamError(e);
-					break;
-				}
-			}
-		}
-		log(Messages.StreamObserver_5);		
-	}
-}

diff --git a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/TextStreamObserver.java b/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/TextStreamObserver.java
deleted file mode 100755
index b86f1bd..0000000
--- a/tools/remotetools/org.eclipse.ptp.remotetools.utils/src/org/eclipse/ptp/remotetools/utils/stream/TextStreamObserver.java
+++ /dev/null

@@ -1,108 +0,0 @@
-/******************************************************************************
- * 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
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- *****************************************************************************/
-
-package org.eclipse.ptp.remotetools.utils.stream;
-
-import java.io.BufferedReader;
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-import org.eclipse.ptp.remotetools.utils.messages.Messages;
-
-/**
- * A temporarily workaround to read lines of text.
- * In future, will be replaced by an IStreamListener that converts
- * blocks of bytes to lines.
- * 
- * @author Daniel Felix Ferber
- * @since 1.0
- * 
- */
-public class TextStreamObserver extends Thread {
-	private BufferedReader reader;
-	private boolean killed;
-	private String name;
-	private ILineStreamListener listener;
-
-	public TextStreamObserver(InputStream input, ILineStreamListener listener,
-			String name) {
-		this.name = name;
-		reader = new BufferedReader(new InputStreamReader(input));
-		this.listener = listener;
-		setName(name);
-	}
-
-	public TextStreamObserver(InputStream input, ILineStreamListener listener) {
-		this.name = this.getClass().getName();
-		reader = new BufferedReader(new InputStreamReader(input));
-		this.listener = listener;
-		setName(name);
-	}
-	
-	public synchronized void kill() {
-		killed = true;
-	}
-
-	void log(String string) {
-//		System.err.println(name + ": " + s);
-	}
-	
-	void newLine(String line) {
-		log(Messages.TextStreamObserver_0 + Integer.toString(line.length()) + Messages.TextStreamObserver_1);
-		listener.newLine(line);
-	}
-
-	void streamClosed() {
-		log(Messages.TextStreamObserver_2);
-		listener.streamClosed();
-	}
-	
-	void streamError(Exception e) {
-		log(Messages.TextStreamObserver_3 + e.getMessage());
-		listener.streamError(e);
-	}
-	
-	public void run() {
-		String line;
-
-		while (!killed) {
-			try {
-				line = reader.readLine();
-				if (line == null) {
-					streamClosed();
-					return;
-				} else {
-					newLine(line);
-				}
-			} catch (IOException e) {
-				if (e instanceof EOFException) {
-					streamClosed();
-					break;
-				} else {
-					streamError(e);
-					break;
-				}
-			} catch (NullPointerException e) {
-				if (killed) {
-					streamClosed();
-					break;
-				} else {
-					streamError(e);
-					break;
-				}
-			}
-		}
-	}
-
-}
commit	6c089fd3db149f7a5e3491110daa6b53e0ae60d7	[log] [tgz]
author	cvs2svn <ptp-dev@eclipse.org>	Mon Jun 13 17:30:41 2011 +0000
committer	cvs2svn <ptp-dev@eclipse.org>	Mon Jun 13 17:30:41 2011 +0000
tree	5d38338d52d18bd7c03b4cfa7d02218984ca46d8
parent	d8ba443b3a24e13a9d371a7006861b70de59cb72 [diff]