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

Sprout from master 2008-09-27 14:34:58 UTC Greg Watson <g.watson@computer.org> 'Update cdt version'
Delete:
    releng/.cvsignore
    releng/org.eclipse.ptp.releng/.cvsignore
    releng/org.eclipse.ptp.releng/.project
    releng/org.eclipse.ptp.releng/build.sh
    releng/org.eclipse.ptp.releng/build.xml
    releng/org.eclipse.ptp.releng/buildsite.xml
    releng/org.eclipse.ptp.releng/maps/ptp.map
    releng/org.eclipse.ptp.releng/master/build.properties
    releng/org.eclipse.ptp.releng/master/customTargets.xml
    releng/org.eclipse.ptp.releng/pack.properties
    releng/org.eclipse.ptp.releng/ptpbuild
    releng/org.eclipse.ptp.rm.ibm.bluegene-feature/.project
    releng/org.eclipse.ptp.rm.ibm.bluegene-feature/build.properties
    releng/org.eclipse.ptp.rm.ibm.bluegene-feature/epl-v10.html
    releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.properties
    releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.xml
    releng/org.eclipse.ptp.rm.ibm.bluegene-feature/license.html
    releng/org.eclipse.ptp.rm.lsf-feature/.project
    releng/org.eclipse.ptp.rm.lsf-feature/build.properties
    releng/org.eclipse.ptp.rm.lsf-feature/epl-v10.html
    releng/org.eclipse.ptp.rm.lsf-feature/feature.properties
    releng/org.eclipse.ptp.rm.lsf-feature/feature.xml
    releng/org.eclipse.ptp.rm.lsf-feature/license.html
    releng/org.eclipse.ptp.rm.mpich2-feature/.project
    releng/org.eclipse.ptp.rm.mpich2-feature/build.properties
    releng/org.eclipse.ptp.rm.mpich2-feature/epl-v10.html
    releng/org.eclipse.ptp.rm.mpich2-feature/feature.properties
    releng/org.eclipse.ptp.rm.mpich2-feature/feature.xml
    releng/org.eclipse.ptp.rm.mpich2-feature/license.html
    releng/org.eclipse.ptp.rm.orte-feature/.project
    releng/org.eclipse.ptp.rm.orte-feature/build.properties
    releng/org.eclipse.ptp.rm.orte-feature/epl-v10.html
    releng/org.eclipse.ptp.rm.orte-feature/feature.properties
    releng/org.eclipse.ptp.rm.orte-feature/feature.xml
    releng/org.eclipse.ptp.rm.orte-feature/license.html
    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/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/.cvsignore
    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/barrierMatches.gif
    tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/barrierPathSelection.png
    tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/clearMarkers.gif
    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.gif
    tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/lib.gif
    tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/menuShowOpenMPartifacts.gif
    tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiBuildCommand.gif
    tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiButtons.gif
    tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiMenu.gif
    tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiNewProjectWorkbench.gif
    tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiProjectSettings.gif
    tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiViewAnn.gif
    tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiWizard.gif
    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/newProjectWizard.gif
    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.gif
    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/removeMarkers.gif
    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/openMPextra.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/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/whatsnew.html
    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.xml
    tools/pldt/org.eclipse.ptp.pldt.doc.user/src/org/eclipse/ptp/pldt/help/HelpPlugin.java
    tools/pldt/org.eclipse.ptp.pldt.doc.user/toc.xml
    tools/pldt/org.eclipse.ptp.pldt.upc/.classpath
    tools/pldt/org.eclipse.ptp.pldt.upc/.cvsignore
    tools/pldt/org.eclipse.ptp.pldt.upc/.project
    tools/pldt/org.eclipse.ptp.pldt.upc/META-INF/MANIFEST.MF
    tools/pldt/org.eclipse.ptp.pldt.upc/build.properties
    tools/pldt/org.eclipse.ptp.pldt.upc/html/id_MYTHREAD.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/id_THREADS.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/id_UPC_MAX_BLOCK_SIZE.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/index.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/keywords.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/shared.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/terms.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_addrfield.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_affinitysize.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_alloc.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_broadcast.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_exchange.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_gather.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_gather_all.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_lock_alloc.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_permute.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_scatter.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_alloc.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_free.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_alloc.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_exit.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_lock_alloc.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_local_alloc.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_attempt.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_free.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_t.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memcpy.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memget.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memset.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_phaseof.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_resetphase.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_threadof.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_unlock.html
    tools/pldt/org.eclipse.ptp.pldt.upc/icons/.cvsignore
    tools/pldt/org.eclipse.ptp.pldt.upc/icons/upc.gif
    tools/pldt/org.eclipse.ptp.pldt.upc/plugin.properties
    tools/pldt/org.eclipse.ptp.pldt.upc/plugin.xml
    tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCArtifactMarkingVisitor.java
    tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCIDs.java
    tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCPlugin.java
    tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/actions/RunAnalyseUPCcommandHandler.java
    tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/analysis/UPCCASTVisitor.java
    tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/editorHelp/UPCCHelpBook.java
    tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/editorHelp/UPCCHelpInfoProvider.java
    tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/prefs/UPCPreferencePage.java
    tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/views/UPCArtifactView.java
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/.classpath
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/.project
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/META-INF/MANIFEST.MF
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/build.properties
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/calls.gif
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/callsC.gif
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/callsCF.gif
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/class_hi.gif
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/graphC.gif
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/graphW.gif
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/sample.gif
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/plugin.xml
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/Activator.java
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/actions/ASTWalkerAction.java
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/handlers/BuildCFGraphHandler.java
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/handlers/BuildCallGraphHandler.java
diff --git a/releng/.cvsignore b/releng/.cvsignore
deleted file mode 100644
index 3a4edf6..0000000
--- a/releng/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-.project
diff --git a/releng/org.eclipse.ptp.releng/.cvsignore b/releng/org.eclipse.ptp.releng/.cvsignore
deleted file mode 100644
index 3d9429e..0000000
--- a/releng/org.eclipse.ptp.releng/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-results
-tools
diff --git a/releng/org.eclipse.ptp.releng/.project b/releng/org.eclipse.ptp.releng/.project
deleted file mode 100644
index 4f01de7..0000000
--- a/releng/org.eclipse.ptp.releng/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.releng</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.ptp.releng/build.sh b/releng/org.eclipse.ptp.releng/build.sh
deleted file mode 100644
index 30f4d10..0000000
--- a/releng/org.eclipse.ptp.releng/build.sh
+++ /dev/null
@@ -1,49 +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
-#*******************************************************************************
-
-# export display for running the tests
-export DISPLAY=:1
-
-# set up to use the Java 5 JRE
-export PATH=/opt/public/common/ibm-java2-ppc-50/bin:$PATH
-
-# make sure we're in the releng project dir 
-cd `dirname $0`
-
-umask 0022
-
-# Checkout basebuilder to run the build
-mkdir -p tools
-cd tools
-cvs -d:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse \
-	checkout -r RC2_34 org.eclipse.releng.basebuilder
-cd ..
-
-# Let's go!
-java -jar tools/org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.launcher.jar \
-	-ws gtk -arch ppc -os linux -application org.eclipse.ant.core.antRunner $*
-
-# Build RDT server packages
-cd results/plugins
-
-# Check out rdt.core.remotejars, rdt.core.stubs and cdt.core for source
-export CVSROOT=:pserver:anonymous@dev.eclipse.org:/cvsroot/tools
-cvs co -d org.eclipse.ptp.rdt.core.remotejars org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core.remotejars
-cvs co -d org.eclipse.ptp.rdt.core.stubs org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core.stubs
-cvs co -r cdt_5_0 -d org.eclipse.cdt.core org.eclipse.cdt/all/org.eclipse.cdt.core
-
-cd org.eclipse.ptp.rdt.core.remotejars
-
-# run the script in remotejars
-export PATH=/opt/public/common/ibm-java2-ppc-50/bin:$PATH
-echo `java -version`
-java -jar ../../../tools/org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.launcher.jar \
-	-ws gtk -arch ppc -os linux -application org.eclipse.ant.core.antRunner
diff --git a/releng/org.eclipse.ptp.releng/build.xml b/releng/org.eclipse.ptp.releng/build.xml
deleted file mode 100644
index b9befc3..0000000
--- a/releng/org.eclipse.ptp.releng/build.xml
+++ /dev/null
@@ -1,405 +0,0 @@
-<project name="PTP" default="nightly">
-	<target name="hi">
-		<echo message="${eclipse.home}"/>
-	</target>
-	
-	<target name="build" depends="zips,test"/>
-	<target name="nightly" depends="tag,zips,sign,test,copy"/>
-	<target name="testbuild" depends="zips,test,copy"/>
-	<target name="buildcopy" depends="zips,copy"/>
-	
-	<target name="init">
-		<touch file="${user.home}/.cvspass" />
-		<tstamp/>
-		<property name="eclipseDist" value="/home/data/httpd/download.eclipse.org/eclipse/downloads/drops/R-3.4-200806172000/eclipse-SDK-3.4-linux-gtk-ppc.tar.gz"/>
-		<property name="cdtDist" value="/home/data/httpd/download.eclipse.org/tools/cdt/builds/5.0.2/I.I200809261507/cdt-master-5.0.2-I.I200809261507.zip"/>
-		<property name="mylynDist" value="/home/data/httpd/download.eclipse.org/tools/mylyn/update/ganymede/mylyn-3.0.1.v20080721-2100-e3.4.zip"/>
-		<property name="rseDist" value="/home/data/httpd/download.eclipse.org/dsdp/tm/downloads/drops/R-3.0-200806202130/RSE-SDK-3.0.zip"/>
-		<property name="photranDist" value="/home/data/httpd/download.eclipse.org/technology/photran/updates/photran40b4-master.zip"/>
-		<property name="tauJars" value="${user.home}/tau_jars.zip"/>
-		<property name="branchVersion" value="2.1.0"/>
-		<property name="timestamp" value="${DSTAMP}${TSTAMP}" />
-		<property name="forceContextQualifier" value="${timestamp}"/>
-		<property name="buildingOSGi" value="true"/>
-		<property name="buildDirectory" value="${basedir}/results"/>
-		<property name="testDirectory" value="${buildDirectory}/test"/>
-		<property name="baseLocation" value="${buildDirectory}/eclipse"/>
-		<property name="pde.build.scripts" value="${eclipse.pdebuild.scripts}"/>
-		<property name="collectingFolder" value="eclipse"/>
-		<property name="archivePrefix" value="eclipse"/>
-		<property name="buildType" value="I" />
-		<property name="buildId" value="${buildType}${timestamp}"/>
-		<property name="zipsdir" value="${buildDirectory}/${buildType}.${buildId}"/>
-		<property name="masterFile" value="ptp-master-${branchVersion}-${buildId}.zip"/>
-		<property name="eclipseTest" value="org.eclipse.test_3.2.0"/>
-		<property name="mailto" value="g.watson@computer.org"/>
-		<property name="eclipseRoot" value=":pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse"/>
-		<property name="baseos" value="${osgi.os}"/>
-		<property name="basews" value="${osgi.ws}"/>
-		<property name="basearch" value="${osgi.arch}"/>
-		<property name="tagbranch" value=""/>
-		<property name="tagname" value="v${timestamp}"/>
-		<property name="testReports" value="${zipsdir}/testReports"/>
-		<property name="junit-report-output" value="${testReports}"/>
-		<condition property="onWindows">
-			<os family="windows"/>
-		</condition>
-		<mkdir dir="${buildDirectory}"/>
-		<mkdir dir="${testReports}"/>
-	</target>
-	
-	<target name="fetch" depends="init">
-		<ant antfile="build.xml" dir="${pde.build.scripts}" target="preBuild">
-			<property name="builder" value="${basedir}/master"/>
-		</ant>
-		<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">
-			<property name="builder" value="${basedir}/master"/>
-		</ant>
-	</target>
-	
-	<target name="unzip" depends="init" unless="dontUnzip">
-		<untar src="${eclipseDist}" dest="${buildDirectory}" compression="gzip"/>
-		<unzip src="${rseDist}" dest="${buildDirectory}"/>
-		<unzip src="${cdtDist}" dest="${buildDirectory}/eclipse"/>
-		<unzip src="${mylynDist}" dest="${buildDirectory}/eclipse"/>
-		<unzip src="${photranDist}" dest="${buildDirectory}/eclipse"/>
-	</target>
-	
-	<target name="zips" depends="init,unzip">
-		<ant antfile="build.xml" dir="${pde.build.scripts}">
-			<property name="builder" value="${basedir}/master" />
-		</ant>
-		<concat destfile="${zipsdir}/compilelog.txt">
-			<fileset dir="${buildDirectory}/plugins" includes="**/*.bin.log"/>
-		</concat>
-		<loadfile property="compileLog" srcFile="${zipsdir}/compilelog.txt"/>
-		<condition property="hasErrors">
-			<contains string="${compileLog}" substring=" ERROR"/>
-		</condition>
-		<move file="${zipsdir}/${masterFile}" todir="${buildDirectory}"/>
-		<unzip src="${buildDirectory}/${masterFile}" dest="${buildDirectory}/site"/>
-		<move file="${buildDirectory}/eclipse/epl-v10.html" todir="${buildDirectory}/site/eclipse"/>
-		<move file="${buildDirectory}/eclipse/notice.html" todir="${buildDirectory}/site/eclipse"/>
-		<copy file="buildsite.xml" tofile="${buildDirectory}/site/eclipse/site.xml"/>
-		<replace file="${buildDirectory}/site/eclipse/site.xml">
-			<replacefilter token="@buildVersion@" value="${branchVersion}.${timestamp}"/>
-		</replace>
-		<copy file="pack.properties" todir="${buildDirectory}/site/eclipse"/>
-
-		<zip destfile="${zipsdir}/${masterFile}"
-			basedir="${buildDirectory}/site/eclipse"/>
-	</target>
-
-	<target name="sign" depends="init" unless="hasErrors">
-		<exec executable="sign">
-			<arg value="/home/data/httpd/download-staging.priv/tools/ptp/releng/results/${buildType}.${buildId}/${masterFile}"/>
-			<arg value="nomail"/>
-			<arg value="/home/data/httpd/download-staging.priv/tools/ptp/releng/results/signed"/>
-		</exec>
-		<waitfor maxwait="30" maxwaitunit="minute">
-			<available file="${buildDirectory}/signed/${masterFile}"/>
-		</waitfor>
-		<move file="${buildDirectory}/signed/${masterFile}" todir="${zipsdir}"/>
-	</target>
-	<target name="test" depends="init" unless="hasErrors"/>
-	<target name="copy" depends="init" unless="hasErrors">
-		<property name="copyToDir" value="/home/www/tools/ptp/builds/${branchVersion}"/>
-		<mkdir dir="${copyToDir}/${buildType}.${buildId}"/>
-		<copy todir="${copyToDir}/${buildType}.${buildId}">
-			<fileset dir="${buildDirectory}/${buildType}.${buildId}"/>
-		</copy>
-		<!-- Create symlink to latest build -->
-		<symlink action="delete" link="${copyToDir}/latest" failonerror="false"/>
-		<symlink link="${copyToDir}/latest" resource="${copyToDir}/${buildType}.${buildId}" overwrite="true"/>
-	</target>
-	
-	<target name="tagone">
-		<cvs cvsroot="/cvsroot/tools" command="rtag ${tagbranch} ${tagname} ${tagmodule}"/>
-	</target>
-	
-	<target name="tag" depends="init">
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.master"/>
-		</antcall>
-		
-		<!--Features-->
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp-feature"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.utils-feature"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.core-feature"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.remote-feature"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.remote.remotetools-feature"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.remote.rse-feature"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.remotetools-feature"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll-feature"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe-feature"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.openmpi-feature"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.external-feature"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.sdm-feature"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.pldt-feature"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.pldt.lapi-feature"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.perf-feature"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.perf.tau-feature"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.perf.tau.fortran-feature"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.rdt-feature"/>
-		</antcall>		
-		
-		<!--Plugins-->
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.utils.core"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.utils.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.proxy.protocol"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.core"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.remotetools.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.remotetools.ui"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.rse.core"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.rse.ui"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.core"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.core"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.help"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.proxy"/>
-		</antcall>			
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.help"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.proxy"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.openmpi.core"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.openmpi.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.rm.remote"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ui"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.ui"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm.core"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm.ui"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.ui"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.proxy"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.utils"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.generichost"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.launcher"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.ui"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.preferences"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.utils"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.launch"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/doc/org.eclipse.ptp.help"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.common"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.lapi"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.analysis"/>
-		</antcall>			
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.analysis.cdt"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.analysis"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.ui.pv"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.wizards"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.jars"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.papiselect"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.perfdmf"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.selinst"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.selinstfort"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.toolopts"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core.remotejars"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core.stubs"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.services"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.aix.ppc"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.linux.ppc"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.linux.x86"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.linux.x86_64"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.macosx.ppc"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.macosx.x86"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.parallel"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.papitest"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core.tests"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.services.test"/>
-		</antcall>
-	</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 7d37af8..0000000
--- a/releng/org.eclipse.ptp.releng/buildsite.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-	<description url="http://download.eclipse.org/tools/ptp/releases/2.1">
-		Parallel Tools Platform update site - Release 2.1
-	</description>
-	<feature url="features/org.eclipse.ptp.core_@buildVersion@.jar" id="org.eclipse.ptp.core" version="@buildVersion@">
-		<category name="Parallel Tools Platform 2.1"/>
-	</feature>
-	<feature url="features/org.eclipse.ptp.utils_@buildVersion@.jar" id="org.eclipse.ptp.utils" version="@buildVersion@">
-		<category name="Parallel Tools Platform 2.1"/>
-	</feature>
-	<feature url="features/org.eclipse.ptp.remotetools_@buildVersion@.jar" id="org.eclipse.ptp.remotetools" version="@buildVersion@">
-		<category name="Parallel Tools Platform 2.1"/>
-	</feature>
-	<feature url="features/org.eclipse.ptp.rm.ibm.ll_@buildVersion@.jar" id="org.eclipse.ptp.rm.ibm.ll" version="@buildVersion@">
-		<category name="Parallel Tools Platform 2.1"/>
-	</feature>
-	<feature url="features/org.eclipse.ptp.rm.ibm.pe_@buildVersion@.jar" id="org.eclipse.ptp.rm.ibm.pe" version="@buildVersion@">
-		<category name="Parallel Tools Platform 2.1"/>
-	</feature>
-	<feature url="features/org.eclipse.ptp.remote.remotetools_@buildVersion@.jar" id="org.eclipse.ptp.remote.remotetools" version="@buildVersion@">
-		<category name="Parallel Tools Platform 2.1"/>
-	</feature>
-	<feature url="features/org.eclipse.ptp.remote.rse_@buildVersion@.jar" id="org.eclipse.ptp.remote.rse" version="@buildVersion@">
-		<category name="Parallel Tools Platform 2.1"/>
-	</feature>
-	<feature url="features/org.eclipse.ptp.debug.sdm_@buildVersion@.jar" id="org.eclipse.ptp.debug.sdm" version="@buildVersion@">
-		<category name="Parallel Tools Platform 2.1"/>
-	</feature>
-	<feature url="features/org.eclipse.ptp.external_@buildVersion@.jar" id="org.eclipse.ptp.external" version="@buildVersion@">
-		<category name="Parallel Tools Platform 2.1"/>
-	</feature>
-	<feature url="features/org.eclipse.ptp.remote_@buildVersion@.jar" id="org.eclipse.ptp.remote" version="@buildVersion@">
-		<category name="Parallel Tools Platform 2.1"/>
-	</feature>
-	<feature url="features/org.eclipse.ptp.rm.openmpi_@buildVersion@.jar" id="org.eclipse.ptp.rm.openmpi" version="@buildVersion@">
-		<category name="Parallel Tools Platform 2.1"/>
-	</feature>
-	<feature url="features/org.eclipse.ptp.pldt_@buildVersion@.jar" id="org.eclipse.ptp.pldt" version="@buildVersion@">
-		<category name="Parallel Tools Platform 2.1"/>
-	</feature>
-	<feature url="features/org.eclipse.ptp.pldt.lapi_@buildVersion@.jar" id="org.eclipse.ptp.pldt.lapi" version="@buildVersion@">
-		<category name="Parallel Tools Platform 2.1"/>
-	</feature>
-	<feature url="features/org.eclipse.ptp.perf_@buildVersion@.jar" id="org.eclipse.ptp.perf" version="@buildVersion@">
-		<category name="Parallel Tools Platform 2.1"/>
-	</feature>
-	<feature url="features/org.eclipse.ptp.perf.tau_@buildVersion@.jar" id="org.eclipse.ptp.perf.tau" version="@buildVersion@">
-		<category name="Parallel Tools Platform 2.1"/>
-	</feature>
-	<feature id="org.eclipse.ptp.rdt" url="features/org.eclipse.ptp.rdt_@buildVersion@.jar" version="@buildVersion@">
-		<category name="Remote Development Tools"/>
-	</feature>
-	<category-def name="Parallel Tools Platform 2.1" label="Parallel Tools Platform 2.1"/>
-	<category-def name="Remote Development Tools" label="Remote Development Tools"/>
-</site>
diff --git a/releng/org.eclipse.ptp.releng/maps/ptp.map b/releng/org.eclipse.ptp.releng/maps/ptp.map
deleted file mode 100644
index 3ee7d2a..0000000
--- a/releng/org.eclipse.ptp.releng/maps/ptp.map
+++ /dev/null
@@ -1,100 +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.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/rms/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/rms/org.eclipse.ptp.rm.ibm.pe-feature
-feature@org.eclipse.ptp.rm.openmpi=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.openmpi-feature
-feature@org.eclipse.ptp.external=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.external-feature
-feature@org.eclipse.ptp.debug.sdm=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.sdm-feature
-feature@org.eclipse.ptp.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.perf=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.perf-feature
-feature@org.eclipse.ptp.perf.tau=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.perf.tau-feature
-feature@org.eclipse.ptp.perf.tau.fortran=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.perf.tau.fortran-feature
-feature@org.eclipse.ptp.rdt=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rdt-feature
-
-! Plugins
-plugin@org.eclipse.ptp=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp
-plugin@org.eclipse.ptp.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.core
-plugin@org.eclipse.ptp.utils.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.utils.core
-plugin@org.eclipse.ptp.utils.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.utils.ui
-plugin@org.eclipse.ptp.proxy.protocol=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.proxy.protocol
-plugin@org.eclipse.ptp.remote.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.remote.core
-plugin@org.eclipse.ptp.remote.remotetools.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.remote.remotetools.core
-plugin@org.eclipse.ptp.remote.remotetools.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.remote.remotetools.ui
-plugin@org.eclipse.ptp.remote.rse.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.remote.rse.core
-plugin@org.eclipse.ptp.remote.rse.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.remote.rse.ui
-plugin@org.eclipse.ptp.remote.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.remote.ui
-plugin@org.eclipse.ptp.rm.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.core
-plugin@org.eclipse.ptp.rm.ibm.ll.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.core
-plugin@org.eclipse.ptp.rm.ibm.ll.help=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.help
-plugin@org.eclipse.ptp.rm.ibm.ll.proxy=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.proxy
-plugin@org.eclipse.ptp.rm.ibm.ll.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.ui
-plugin@org.eclipse.ptp.rm.ibm.pe.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.core
-plugin@org.eclipse.ptp.rm.ibm.pe.help=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.help
-plugin@org.eclipse.ptp.rm.ibm.pe.proxy=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.proxy
-plugin@org.eclipse.ptp.rm.ibm.pe.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.ui
-plugin@org.eclipse.ptp.rm.mpi.openmpi.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.openmpi.core
-plugin@org.eclipse.ptp.rm.mpi.openmpi.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.openmpi.ui
-plugin@org.eclipse.ptp.rm.remote=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.rm.remote
-plugin@org.eclipse.ptp.rm.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ui
-plugin@org.eclipse.ptp.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.ui
-plugin@org.eclipse.ptp.debug.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.core
-plugin@org.eclipse.ptp.debug.sdm=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm
-plugin@org.eclipse.ptp.debug.sdm.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm.core
-plugin@org.eclipse.ptp.debug.sdm.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm.ui
-plugin@org.eclipse.ptp.debug.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.ui
-plugin@org.eclipse.ptp.debug.sdm=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm
-plugin@org.eclipse.ptp.proxy=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.proxy
-plugin@org.eclipse.ptp.utils=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.utils
-plugin@org.eclipse.ptp.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
-plugin@org.eclipse.ptp.launch=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.launch
-plugin@org.eclipse.ptp.help=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/doc/org.eclipse.ptp.help
-plugin@org.eclipse.ptp.pldt.common=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.common
-plugin@org.eclipse.ptp.pldt.help=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.help
-plugin@org.eclipse.ptp.pldt.lapi=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.lapi
-plugin@org.eclipse.ptp.pldt.mpi.analysis=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.analysis
-plugin@org.eclipse.ptp.pldt.mpi.analysis.cdt=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.analysis.cdt
-plugin@org.eclipse.ptp.pldt.mpi.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.core
-plugin@org.eclipse.ptp.pldt.openmp.analysis=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.analysis
-plugin@org.eclipse.ptp.pldt.openmp.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.core
-plugin@org.eclipse.ptp.pldt.openmp.ui.pv=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.ui.pv
-plugin@org.eclipse.ptp.pldt.wizards=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.wizards
-plugin@org.eclipse.ptp.perf=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf
-plugin@org.eclipse.ptp.perf.tau=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau
-plugin@org.eclipse.ptp.perf.tau.jars=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.jars
-plugin@org.eclipse.ptp.perf.tau.papiselect=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.papiselect
-plugin@org.eclipse.ptp.perf.tau.perfdmf=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.perfdmf
-plugin@org.eclipse.ptp.perf.tau.selinst=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.selinst
-plugin@org.eclipse.ptp.perf.tau.selinstfort=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.selinstfort
-plugin@org.eclipse.ptp.perf.toolopts=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.toolopts
-plugin@org.eclipse.ptp.rdt.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core
-plugin@org.eclipse.ptp.rdt.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.ui
-plugin@org.eclipse.ptp.rdt.services=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.services
-
-! Fragments
-fragment@org.eclipse.ptp.aix.ppc=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.aix.ppc
-fragment@org.eclipse.ptp.linux.ppc=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.linux.ppc
-fragment@org.eclipse.ptp.linux.x86=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.linux.x86
-fragment@org.eclipse.ptp.linux.x86_64=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.linux.x86_64
-fragment@org.eclipse.ptp.macosx.ppc=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.macosx.ppc
-fragment@org.eclipse.ptp.macosx.x86=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.macosx.x86
-fragment@org.eclipse.ptp.perf.parallel=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.parallel
-
-! Tests
-plugin@org.eclipse.ptp.perf.tau.papitest=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.papitest
-plugin@org.eclipse.ptp.rdt.core.tests=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core.tests
-
diff --git a/releng/org.eclipse.ptp.releng/master/build.properties b/releng/org.eclipse.ptp.releng/master/build.properties
deleted file mode 100644
index c236ce2..0000000
--- a/releng/org.eclipse.ptp.releng/master/build.properties
+++ /dev/null
@@ -1,99 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#####################
-# Parameters describing how and where to execute the build.
-# Typical users need only update the following properties:
-#    baseLocation - where things you are building against are installed
-#    bootclasspath - The base jars to compile against (typicaly rt.jar)
-#    configs - the list of {os, ws, arch} configurations to build.  
-#
-# Of course any of the settings here can be overridden by spec'ing 
-# them on the command line (e.g., -DbaseLocation=d:/eclipse
-
-############# CVS CONTROL ################
-# The CVS tag to use when fetching the map files from the repository
-mapVersionTag=HEAD
-
-# The CVS tag to use when fetching elements to build.  By default the
-# builder will use whatever is in the maps.  Use this value to override
-# for example, when doing a nightly build out of HEAD
-# fetchTag=HEAD
-
-ptpTag=HEAD
-
-############## BUILD / GENERATION CONTROL ################
-# The directory into which the build elements will be fetched and where
-# the build will take place.  buildDirectory and install should be the same
-# value.
-buildDirectory=build
-
-# Type of build.  Used in naming the build output.  Typically this value is
-# one of I, N, M, S, ...
-buildType=I
-
-# ID of the build.  Used in naming the build output.
-buildId=TestBuild
-
-# Label for the build.  Used in naming the build output
-buildLabel=${buildType}.${buildId}
-
-# Timestamp for the build.  Used in naming the build output
-timestamp=007
-
-# Base location for anything the build needs to compile against.  For example,
-# when building GEF, the baseLocation should be the location of a previously
-# installed Eclipse against which the GEF code will be compiled.
-baseLocation=
-
-#Os/Ws/Arch/nl of the eclipse specified by baseLocation
-#baseos
-#basews
-#basearch
-#basenl
-
-# The location underwhich all of the build output will be collected.  This will be
-# the root path in the resultant zip file.
-collPlace=eclipse
-
-# The directory  in which to execute zip of the ${collPlace} directory
-collBase=.
-
-# The list of {os, ws, arch} configurations to build.  This 
-# value is a '&' separated list of ',' separate triples.  For example, 
-#     configs=win32,win32,x86 & linux,motif,x86
-# By default the value is *,*,*
-configs= \
-	  aix,motif,ppc \
-    & linux,gtk,x86 \
-    & linux,gtk,x86_64 \
-    & linux,gtk,ppc \
-    & macosx,carbon,ppc \
-    & win32,win32,x86
-
-outputUpdateJars=true
-groupConfigurations=true
-
-#Arguments to send to the zip executable
-zipargs=
-
-############# JAVA COMPILER OPTIONS ##############
-# The location of the Java jars to compile against.  Typically the rt.jar for your JDK/JRE
-#bootclasspath=d:/ibm1.3.1/jre/lib/rt.jar
-
-javacDebugInfo=on
-javacVerbose=true
-javacFailOnError=false
-
-# The version of the source code
-javacSource=1.5
-
-# The version of the byte code targeted
-javacTarget=1.5
diff --git a/releng/org.eclipse.ptp.releng/master/customTargets.xml b/releng/org.eclipse.ptp.releng/master/customTargets.xml
deleted file mode 100644
index 4fb6f5e..0000000
--- a/releng/org.eclipse.ptp.releng/master/customTargets.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<project name="Build specific targets and properties" default="noDefault" >
-
-<!-- ===================================================================== -->
-<!-- Run a given ${target} on all elements being built -->
-<!-- Add on <ant> task for each top level element being built. -->
-<!-- ===================================================================== -->
-<target name="allElements">
-	<ant antfile="${genericTargets}" target="${target}">
-		<property name="type" value="feature"/>
-		<property name="id" value="org.eclipse.ptp.master"/>
-	</ant>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Targets to assemble the built elements for particular configurations  -->
-<!-- These generally call the generated assemble scripts (named in -->
-<!-- ${assembleScriptName}) but may also add pre and post processing -->
-<!-- Add one target for each root element and each configuration -->
-<!-- ===================================================================== -->
-
-<target name="assemble.org.eclipse.ptp.master.group.group.group">
-	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="ptp-master-${branchVersion}-${buildId}.zip"/>
-	</ant>
-</target>
-	
-<!-- ===================================================================== -->
-<!-- Check out map files from correct repository -->
-<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
-<!-- ===================================================================== -->
-<target name="getMapFiles">
-	<copy file="${builder}/../maps/ptp.map" todir="${buildDirectory}/maps"/>
-	<replace file="${buildDirectory}/maps/ptp.map">
-		<replacefilter token="@ptpTag@" value="${ptpTag}"/>
-	</replace>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do before setup -->
-<!-- ===================================================================== -->
-<target name="preSetup">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after setup but before starting the build proper -->
-<!-- ===================================================================== -->
-<target name="postSetup">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do before fetching the build elements -->
-<!-- ===================================================================== -->
-<target name="preFetch">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after fetching the build elements -->
-<!-- ===================================================================== -->
-<target name="postFetch">
-	<condition property="patchesAvailable">
-		<available file="${builder}/patch.xml"/>
-	</condition>
-	<antcall target="applyPatches"/>
-</target>
-
-<target name="applyPatches" if="patchesAvailable">
-	<ant antfile="${builder}/patch.xml"/>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do before generating the build scripts. -->
-<!-- ===================================================================== -->
-<target name="preGenerate">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after generating the build scripts. -->
-<!-- ===================================================================== -->
-<target name="postGenerate">
-</target>
-
-
-<!-- ===================================================================== -->
-<!-- Steps to do before running the build.xmls for the elements being built. -->
-<!-- ===================================================================== -->
-<target name="preProcess">
-	<replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@build@">
-		<include name="**/about.mappings" />
-	</replace>
-	<unzip src="${tauJars}" dest="${buildDirectory}"/>
-</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 0cd82b2..0000000
--- a/releng/org.eclipse.ptp.releng/ptpbuild
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-#
-# ptpbuild wrapper script
-#
-# Usage: ptpbuild version [build_args]
-#
-# where version is the current PTP version being built and
-# build_args are any other 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
-
-if [ $# -lt 1 ]; then
-	echo "usage: ptpbuild version [build_args]"
-	exit 1
-fi
-
-# Version of PTP we're building
-PTP_VERSION=$1; shift
-
-# main staging directory
-STAGING_DIR=/opt/public/download-staging.priv/tools/ptp/releng
-
-# download location for builds
-BUILDS_DIR=/home/www/tools/ptp/builds/$PTP_VERSION
-
-# create the releng staging directory and go there
-mkdir -p $STAGING_DIR
-cd $STAGING_DIR
-
-# make a link to the results
-if [ ! -L results ]; then
-	ln -s org.eclipse.ptp/releng/org.eclipse.ptp.releng/results results
-fi
-
-# remove the old build
-rm -fr org.eclipse.ptp
-
-# Check out the releng project
-export CVSROOT=:pserver:anonymous@dev.eclipse.org:/cvsroot/tools
-cvs co org.eclipse.ptp/releng/org.eclipse.ptp.releng
-
-# run the main script
-cd org.eclipse.ptp/releng/org.eclipse.ptp.releng
-sh build.sh $* 2>&1 | tee $STAGING_DIR/build.log
-
-# Copy the build.log to where the latest build is. Only copy
-# if a build.log doesn't exist, otherwise the build failed and
-# we would copy over an old log file.
-if [ ! -f $BUILDS_DIR/latest/build.log ]; then
-	cp $STAGING_DIR/build.log $BUILDS_DIR/latest
-fi
diff --git a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/.project b/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/.project
deleted file mode 100644
index 861eb7b..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.ibm.bluegene-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/build.properties b/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/build.properties
deleted file mode 100644
index 279df8f..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html
diff --git a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/epl-v10.html b/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.properties b/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.properties
deleted file mode 100644
index 95b0993..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.properties
+++ /dev/null
@@ -1,148 +0,0 @@
-#################################################################################
-# Copyright (c) 2005 The Regents of the University of California. 
-# This material was produced under U.S. Government contract W-7405-ENG-36 
-# for Los Alamos National Laboratory, which is operated by the University 
-# of California for the U.S. Department of Energy. The U.S. Government has 
-# rights to use, reproduce, and distribute this software. NEITHER THE 
-# GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
-# ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
-# to produce derivative works, such modified software should be clearly marked, 
-# so as not to confuse it with the version available from LANL.
-# 
-# Additionally, this program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# LA-CC 04-115
-#
-#################################################################################
-
-
-# "featureName" property - name of the feature
-featureName=PTP Support For Blue Gene
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Adds support for the Blue Gene system
-
-# copyright
-copyright=\
-Copyright (c) 2007 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-IBM Corporation - Initial API and implementation\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.xml b/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.xml
deleted file mode 100644
index 5806959..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.rm.ibm.bluegene"
-      label="%featureName"
-      version="2.0.0.qualifier"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ptp.proxy.protocol"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.ptp.remote"/>
-      <import plugin="org.eclipse.ptp.ui"/>
-      <import plugin="org.eclipse.ptp.launch"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.bluegene.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.bluegene.proxy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.bluegene.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/license.html b/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/releng/org.eclipse.ptp.rm.lsf-feature/.project b/releng/org.eclipse.ptp.rm.lsf-feature/.project
deleted file mode 100644
index 4e56dff..0000000
--- a/releng/org.eclipse.ptp.rm.lsf-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.lsf-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.ptp.rm.lsf-feature/build.properties b/releng/org.eclipse.ptp.rm.lsf-feature/build.properties
deleted file mode 100644
index 279df8f..0000000
--- a/releng/org.eclipse.ptp.rm.lsf-feature/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html
diff --git a/releng/org.eclipse.ptp.rm.lsf-feature/epl-v10.html b/releng/org.eclipse.ptp.rm.lsf-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.rm.lsf-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/releng/org.eclipse.ptp.rm.lsf-feature/feature.properties b/releng/org.eclipse.ptp.rm.lsf-feature/feature.properties
deleted file mode 100644
index 05b6267..0000000
--- a/releng/org.eclipse.ptp.rm.lsf-feature/feature.properties
+++ /dev/null
@@ -1,156 +0,0 @@
-#################################################################################
-# Copyright (c) 2005 The Regents of the University of California. 
-# This material was produced under U.S. Government contract W-7405-ENG-36 
-# for Los Alamos National Laboratory, which is operated by the University 
-# of California for the U.S. Department of Energy. The U.S. Government has 
-# rights to use, reproduce, and distribute this software. NEITHER THE 
-# GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
-# ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
-# to produce derivative works, such modified software should be clearly marked, 
-# so as not to confuse it with the version available from LANL.
-# 
-# Additionally, this program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# LA-CC 04-115
-#
-#################################################################################
-
-
-# "featureName" property - name of the feature
-featureName=PTP Support For LSF
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Adds support for the LSF job scheduler
-
-# copyright
-copyright=\
-Copyright (c) 2005 The Regents of the University of California.\n\
-This material was produced under U.S. Government contract W-7405-ENG-36\n\
-for Los Alamos National Laboratory, which is operated by the University\n\
-of California for the U.S. Department of Energy. The U.S. Government has\n\
-rights to use, reproduce, and distribute this software. NEITHER THE\n\
-GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR\n\
-ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified\n\
-to produce derivative works, such modified software should be clearly marked,\n\
-so as not to confuse it with the version available from LANL.\n\
-\n\
-Additionally, this program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-LA-CC 04-115\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/releng/org.eclipse.ptp.rm.lsf-feature/feature.xml b/releng/org.eclipse.ptp.rm.lsf-feature/feature.xml
deleted file mode 100644
index 8b8551f..0000000
--- a/releng/org.eclipse.ptp.rm.lsf-feature/feature.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.rm.lsf"
-      label="%featureName"
-      version="2.0.0.qualifier"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ptp.remote"/>
-      <import plugin="org.eclipse.ptp.proxy.protocol"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.ptp.ui"/>
-      <import plugin="org.eclipse.ptp.launch"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.rm.lsf.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.lsf.proxy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.lsf.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/releng/org.eclipse.ptp.rm.lsf-feature/license.html b/releng/org.eclipse.ptp.rm.lsf-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.rm.lsf-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/releng/org.eclipse.ptp.rm.mpich2-feature/.project b/releng/org.eclipse.ptp.rm.mpich2-feature/.project
deleted file mode 100644
index 52f476f..0000000
--- a/releng/org.eclipse.ptp.rm.mpich2-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.mpich2-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.ptp.rm.mpich2-feature/build.properties b/releng/org.eclipse.ptp.rm.mpich2-feature/build.properties
deleted file mode 100644
index 279df8f..0000000
--- a/releng/org.eclipse.ptp.rm.mpich2-feature/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html
diff --git a/releng/org.eclipse.ptp.rm.mpich2-feature/epl-v10.html b/releng/org.eclipse.ptp.rm.mpich2-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.rm.mpich2-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/releng/org.eclipse.ptp.rm.mpich2-feature/feature.properties b/releng/org.eclipse.ptp.rm.mpich2-feature/feature.properties
deleted file mode 100644
index 335cd5b..0000000
--- a/releng/org.eclipse.ptp.rm.mpich2-feature/feature.properties
+++ /dev/null
@@ -1,156 +0,0 @@
-#################################################################################
-# Copyright (c) 2005 The Regents of the University of California. 
-# This material was produced under U.S. Government contract W-7405-ENG-36 
-# for Los Alamos National Laboratory, which is operated by the University 
-# of California for the U.S. Department of Energy. The U.S. Government has 
-# rights to use, reproduce, and distribute this software. NEITHER THE 
-# GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
-# ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
-# to produce derivative works, such modified software should be clearly marked, 
-# so as not to confuse it with the version available from LANL.
-# 
-# Additionally, this program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# LA-CC 04-115
-#
-#################################################################################
-
-
-# "featureName" property - name of the feature
-featureName=PTP Support For MPICH2
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Adds support for MPICH2
-
-# copyright
-copyright=\
-Copyright (c) 2005 The Regents of the University of California.\n\
-This material was produced under U.S. Government contract W-7405-ENG-36\n\
-for Los Alamos National Laboratory, which is operated by the University\n\
-of California for the U.S. Department of Energy. The U.S. Government has\n\
-rights to use, reproduce, and distribute this software. NEITHER THE\n\
-GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR\n\
-ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified\n\
-to produce derivative works, such modified software should be clearly marked,\n\
-so as not to confuse it with the version available from LANL.\n\
-\n\
-Additionally, this program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-LA-CC 04-115\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/releng/org.eclipse.ptp.rm.mpich2-feature/feature.xml b/releng/org.eclipse.ptp.rm.mpich2-feature/feature.xml
deleted file mode 100644
index 4b5eb4a..0000000
--- a/releng/org.eclipse.ptp.rm.mpich2-feature/feature.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.rm.mpich2"
-      label="%featureName"
-      version="2.1.0.qualifier"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ptp.proxy.protocol"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.ptp.remote"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.ptp.ui"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.rm.mpich2.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.mpich2.proxy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.mpich2.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/releng/org.eclipse.ptp.rm.mpich2-feature/license.html b/releng/org.eclipse.ptp.rm.mpich2-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.rm.mpich2-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/releng/org.eclipse.ptp.rm.orte-feature/.project b/releng/org.eclipse.ptp.rm.orte-feature/.project
deleted file mode 100644
index 5884ded..0000000
--- a/releng/org.eclipse.ptp.rm.orte-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.orte-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.ptp.rm.orte-feature/build.properties b/releng/org.eclipse.ptp.rm.orte-feature/build.properties
deleted file mode 100644
index 279df8f..0000000
--- a/releng/org.eclipse.ptp.rm.orte-feature/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html
diff --git a/releng/org.eclipse.ptp.rm.orte-feature/epl-v10.html b/releng/org.eclipse.ptp.rm.orte-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.rm.orte-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/releng/org.eclipse.ptp.rm.orte-feature/feature.properties b/releng/org.eclipse.ptp.rm.orte-feature/feature.properties
deleted file mode 100644
index 48c887f..0000000
--- a/releng/org.eclipse.ptp.rm.orte-feature/feature.properties
+++ /dev/null
@@ -1,156 +0,0 @@
-#################################################################################
-# Copyright (c) 2005 The Regents of the University of California. 
-# This material was produced under U.S. Government contract W-7405-ENG-36 
-# for Los Alamos National Laboratory, which is operated by the University 
-# of California for the U.S. Department of Energy. The U.S. Government has 
-# rights to use, reproduce, and distribute this software. NEITHER THE 
-# GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
-# ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
-# to produce derivative works, such modified software should be clearly marked, 
-# so as not to confuse it with the version available from LANL.
-# 
-# Additionally, this program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# LA-CC 04-115
-#
-#################################################################################
-
-
-# "featureName" property - name of the feature
-featureName=PTP Support For Open MPI
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Adds support for Open MPI
-
-# copyright
-copyright=\
-Copyright (c) 2005 The Regents of the University of California.\n\
-This material was produced under U.S. Government contract W-7405-ENG-36\n\
-for Los Alamos National Laboratory, which is operated by the University\n\
-of California for the U.S. Department of Energy. The U.S. Government has\n\
-rights to use, reproduce, and distribute this software. NEITHER THE\n\
-GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR\n\
-ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified\n\
-to produce derivative works, such modified software should be clearly marked,\n\
-so as not to confuse it with the version available from LANL.\n\
-\n\
-Additionally, this program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-LA-CC 04-115\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/releng/org.eclipse.ptp.rm.orte-feature/feature.xml b/releng/org.eclipse.ptp.rm.orte-feature/feature.xml
deleted file mode 100644
index 89b2532..0000000
--- a/releng/org.eclipse.ptp.rm.orte-feature/feature.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.rm.orte"
-      label="%featureName"
-      version="2.0.1.qualifier"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ptp.proxy.protocol"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.ptp.rm.remote"/>
-      <import plugin="org.eclipse.ptp.utils"/>
-      <import plugin="org.eclipse.ptp.proxy"/>
-      <import plugin="org.eclipse.ptp.ui"/>
-      <import plugin="org.eclipse.ptp.launch"/>
-      <import plugin="org.eclipse.ptp.remote.core"/>
-      <import plugin="org.eclipse.ptp.remote.ui"/>
-      <import plugin="org.eclipse.ptp.utils.ui"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.rm.orte.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.orte.proxy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.orte.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/releng/org.eclipse.ptp.rm.orte-feature/license.html b/releng/org.eclipse.ptp.rm.orte-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.rm.orte-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/.classpath b/tools/pldt/org.eclipse.ptp.pldt.doc.user/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/.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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<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 50114c3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.help</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/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 2e248a5..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: PTP Parallel Language Development Tools Help Plug-in
-Bundle-SymbolicName: org.eclipse.ptp.pldt.help; singleton:=true
-Bundle-Version: 2.1.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.ptp.pldt.help.HelpPlugin
-Bundle-Vendor: IBM Research
-Bundle-Localization: plugin
-Export-Package: org.eclipse.ptp.pldt.help
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.help
-Eclipse-AutoStart: true
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 2889412..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-bin.includes = plugin.xml,\
-               html/,\
-               toc.xml,\
-               .,\
-               META-INF/,\
-               intro/
-src.includes = html/,\
-               plugin.xml,\
-               toc.xml
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-bin.excludes = html/imagesOld/
diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/.cvsignore
deleted file mode 100644
index e4b8db5..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-imagesOld
-imagesOld2
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 f19f2c1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/barrier.html
+++ /dev/null
@@ -1,238 +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"> Barrier Analysis: A Short Introduction</h1>
-<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 highlighted in
-the editor in red. 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.
- <!-- 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>&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 8f09f90..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/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/clearMarkers.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/clearMarkers.gif
deleted file mode 100644
index 3646c09..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/clearMarkers.gif
+++ /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.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/include.gif
deleted file mode 100644
index b29c3f9..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/include.gif
+++ /dev/null
Binary files differ
diff --git a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/lib.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/lib.gif
deleted file mode 100644
index 8af2ff2..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/lib.gif
+++ /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/mpiBuildCommand.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiBuildCommand.gif
deleted file mode 100644
index de33341..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiBuildCommand.gif
+++ /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.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiMenu.gif
deleted file mode 100644
index 8d1ca21..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiMenu.gif
+++ /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/mpiProjectSettings.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiProjectSettings.gif
deleted file mode 100644
index 2b6270b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiProjectSettings.gif
+++ /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.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiWizard.gif
deleted file mode 100644
index 262403d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/mpiWizard.gif
+++ /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/newProjectWizard.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/newProjectWizard.gif
deleted file mode 100644
index 92e1f14..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/newProjectWizard.gif
+++ /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 a3ae384..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.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/pldt-menu.gif
deleted file mode 100644
index cdd77b9..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/pldt-menu.gif
+++ /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 8c8a827..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/removeMarkers.gif b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/removeMarkers.gif
deleted file mode 100644
index 7635703..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/images/removeMarkers.gif
+++ /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/openMPextra.html b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/openMPextra.html
deleted file mode 100644
index 9be244d..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> 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/run.html b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/run.html
deleted file mode 100644
index ced4a93..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/run.html
+++ /dev/null
@@ -1,119 +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> Running the MPI Tools within the Parallel Language Development Tools</h1>
-<p>To run the PTP PLDT MPI Tools, 
-create a project (e.g a Managed Make C 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 hould 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 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 an 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>Select the source file to analyse, to find the MPI artifacts.
-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/pldt-menu.gif">
-<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.
-</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.gif" 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.gif">
-<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.
-<br><img src="images/contentAssist.gif" border=1>
-<p>
-<li><b>Content 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 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 c70573e..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> Running PTP OpenMP Tools Plug-in</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 2515246..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/setup.html
+++ /dev/null
@@ -1,105 +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>Setup for MPI Tools within the Parallel Language Development Tools</h1>
-
-<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>To specify the MPI include path, use Window > Preferences. (For Mac, use Eclipse > Preferences)
-Under PTP, 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 included without it.)
-
-<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.
-<br><img src="images/pldt-prefs1.png">
-
-
-
-<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>File->New->C project (if you are already in the C/C++ perspective this may be the simplest)
-<br>is one way; there are several ways to get to this wizard
-Enter a project name; under Project types, expand 'executable' and select, e.g. "MPI Hello World C project"
-<br>
-<img src="images/mpiWizard.gif">
-<br>Select Next.
-<br>On the next page, fill in any project template values, e.g. your name.
-<br>Then select Next.
-<br><img src="images/mpiWizard2.gif">
-<p>On the next page, "MPI Project Settings" page,  make sure the "Add MPI project settings to this project"
-is 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.
-
-<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 CDT project (e.g. Managed Make C Project)
-
-<li>Set up the include paths etc:
-<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.gif">
-<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.gif">
-<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.gif">
-</ol>
-<p>
-
-</ol>
-
-<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/setupOMP.html b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/setupOMP.html
deleted file mode 100644
index ca53f4e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/setupOMP.html
+++ /dev/null
@@ -1,36 +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> 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
-<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.
-<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 OpenMP to your project.
-<p>Note the header file name in your system, e.g. <code>openmp.h</code> vs <code>omp.h</code>; you may need to adjust the include file
-line in the sample source file to match your system.
-<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 5ed8169..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/toc.html
+++ /dev/null
@@ -1,109 +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 2.0
-<p>The PTP Parallel Language Development Tools (PLDT) provide
-tools to aid in MPI Programming and other parallel languages and tools.
-<br>Features of the PLDT include:
-<ul>
-<li>Analysis of C and C++ code to determine the location of MPI and OpenMP Artifacts
-<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 the MPI and OpenMP calls via F1 (Cntl-F1 on Linux; Help key on Mac)
-
-<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 projects.
-
-<p>The newest features (2.0) include:
-<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>New project wizard can include sample MPI and OpenMP source files 
-and set up the projects to save time.
-<li>New welcome pages introduce new Eclipse users to PLDT.
-<li>New single-menu UI for PLDT analysis features simplifies the editor toolbar.
-<br><img src="images/pldt-menu.gif">
-</ul>
-For more details, see <a href="whatsnew.html">What's new</a>
-<h2>
-Pre-requisites:
-</h2>
-<p>PLDT 2.0 requires the base Eclipse platform, the CDT, and MPI and/or OpenMP.
-<ul>
-<li><b>Eclipse</b> platform: Version  3.3 or later
-<li><b>CDT:</b>
-Version 4.0.2 or later for C/C++ files.  (Wherever CDT is mentioned, Photran projects and files,
-for C/C++, if based on Eclipse 3.3/CDT 4.0.x, 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)
-<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, similar to the MPI
-pre-requisites above.
-
-</ul>
-<p>Note that <i>running</i> MPI or OpenMP is not really required for the PLDT
-to function and provide analysis and help with MPI and OpenMP development.
-Just the header files are required 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 
-(2.0, January 2008) this is OpenMPI, which is available for Linux and Mac Only.  
-But for PLDT, this is not required, and PLDT will work
-on Windows as well.
-
-
-<h2>Help Topics</h2>
-<p><a href="http://wiki.eclipse.org/PTP/release_notes/2.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>
-</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>
-<a href="whatsnew.html">New and Noteworthy </a></li> - what's new in PLDT 2.0
-<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;
-<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/tracing.html b/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/tracing.html
deleted file mode 100644
index 2b861d8..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> <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>Back to <a href="whatsnew.html">What's New</a> page.
-</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 11a525a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/html/whatsnew.html
+++ /dev/null
@@ -1,55 +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"> PLDT - New and Noteworthy </h1>
-<p>What's new in 2.1
-<ul>
-<li>MPI Code Templates
-<li>UPC assistance tools
-<li>Dynamic tool example of Performance Tools framework [tbd]...
-</ul>
-
-<p>What's new in 2.0
-<ul>
-<li>New single-menu UI for PLDT analysis features simplifies the editor toolbar.
-<br><script> full("images/pldt-menu.gif")</script>
-<br>&nbsp;
-<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.
-<br><img src="images/barrierMatches.gif">
-<br>&nbsp;
-<br><img src="images/barrierErrors.gif">
-<br>&nbsp;
-<br>For details, see <a href="barrier.html">MPI Barrier Analysis</a>.
-<br>&nbsp;
-<li>New project templates allow easy creation of MPI <i>and OpenMP</i> projects.
-Sample source files can be added during project creation as well.
-<br><img src="images/newProjectWizard.gif">
-<br>&nbsp;
-<li>MPI project settings page can add include files, build command, etc. to new MPI projects
-<br><img src="images/mpiProjectSettings.gif">
-<br>&nbsp;
-<li>If CDT version is incorrect (!= 4.x) an error dialog complains.
-<li>Welcome page includes pointers to information for PLDT.
-<br><img src="images/welcomeOverview.gif">
-<br><img src="images/welcomeC-pldt.gif">
-<br>&nbsp;
-<li>Artifact markers can be removed directly from the artifacts view.
-<br><img src="images/removeMarkers.gif">
-<br>&nbsp;
-<li>Tracing is enabled.  <a href="tracing.html">See tracing instructions for how to turn this on.</a>
-
-
-
-</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/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 5b6cf9c..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.help/html/toc.html" >
-       		<text>Learn more about PLDT, to help in developing MPI and OpenMP programs.</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 600c643..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.help/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 0d894ef..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.help/html/whatsnew.html" 
-       		id="orgeclipseptppldtwelcome-introLink" style-id="content-link">
-          		<text>Find out the new features in PLDT 2.0.</text>
-       		</link>
-       	</group>
-  	</extensionContent>
-</introContent>
-
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 dbbd415..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/plugin.xml
+++ /dev/null
@@ -1,33 +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"/>
-      <index path="org.eclipse.ptp.pldt.help.index1"/>
-   </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/src/org/eclipse/ptp/pldt/help/HelpPlugin.java b/tools/pldt/org.eclipse.ptp.pldt.doc.user/src/org/eclipse/ptp/pldt/help/HelpPlugin.java
deleted file mode 100644
index 83dd104..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/src/org/eclipse/ptp/pldt/help/HelpPlugin.java
+++ /dev/null
@@ -1,103 +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.help;
-
-import org.eclipse.ui.plugin.*;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.osgi.framework.BundleContext;
-import java.util.*;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class HelpPlugin extends AbstractUIPlugin
-{
-    /** The shared instance. */
-    private static HelpPlugin plugin;
-    /** Resource bundle */
-    private ResourceBundle    resourceBundle;
-    /** the plug-in ID */
-    public static final String PLUGIN_ID="org.eclipse.ptp.pldt.help";
-
-    /**
-     * The constructor.
-     */
-    public HelpPlugin()
-    {
-        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 HelpPlugin 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 = HelpPlugin.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.help.HelpPluginResources");
-        } 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(PLUGIN_ID, path);
-    }
-}
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 493fcbd..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.doc.user/toc.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="PTP Parallel Language Development Tools" topic="html/toc.html">
-
-      <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 label="MPI Barrier Analysis"  href="html/barrier.html"/> 
-   <topic label="New and Noteworthy"  href="html/whatsnew.html"/>
-</toc>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/.classpath b/tools/pldt/org.eclipse.ptp.pldt.upc/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.upc/.cvsignore
deleted file mode 100644
index 2cc8dd1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-icons-old
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/.project b/tools/pldt/org.eclipse.ptp.pldt.upc/.project
deleted file mode 100644
index 6349367..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.upc</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/META-INF/MANIFEST.MF b/tools/pldt/org.eclipse.ptp.pldt.upc/META-INF/MANIFEST.MF
deleted file mode 100644
index dc44a09..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: UPC support for PLDT
-Bundle-SymbolicName: org.eclipse.ptp.pldt.upc;singleton:=true
-Bundle-Version: 2.1.0.qualifier
-Bundle-Activator: org.eclipse.ptp.pldt.upc.UPCPlugin
-Bundle-Vendor: IBM Research
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.cdt.core,
- org.eclipse.cdt.ui,
- org.eclipse.ptp.pldt.common,
- org.eclipse.help,
- org.eclipse.cdt.doc.user,
- org.eclipse.cdt.core.parser.upc;bundle-version="5.0.0"
-Eclipse-AutoStart: true
-Bundle-ClassPath: .
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/build.properties b/tools/pldt/org.eclipse.ptp.pldt.upc/build.properties
deleted file mode 100644
index 33c2c65..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               icons/,\
-               html/,\
-               plugin.properties
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_MYTHREAD.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_MYTHREAD.html
deleted file mode 100644
index 367221c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_MYTHREAD.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<h2><code>MYTHREAD</code> keyword</h2>
-
-
-<h4>Description</h4>
-<p>
-<code>MYTHREAD</code>  is an expression with a value of type int; it specifies the unique
-thread index. 
-<br>The range of possible values is <code>0..THREADS-16</code>.
-<h4>Example</h4>
-<p>The following program prints the numbers 0
-through <code>THREADS-1</code>, in some order.
-<pre>
-    #include &lt;upc.h&gt;
-    main(){ 
-      printf("%d ",MYTHREAD); 
-    }
-</pre>
-<p>See also <a href="id_THREADS.html"><code>THREADS</code></a>,
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_THREADS.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_THREADS.html
deleted file mode 100644
index 9a00383..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_THREADS.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<h2><code><code>THREADS</code></code> keyword</h2>
-
-
-<h4>Description</h4>
-<p>
-<code>THREADS</code> is an expression with a value of type <code>int</code>; it specifies the number of
-threads and has the same value on every thread. Under the static <code>THREADS</code>
-translation environment, <code>THREADS</code> is an <code>int</code>eger constant suitable for use in
-#if preprocessing directives.
-
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_UPC_MAX_BLOCK_SIZE.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_UPC_MAX_BLOCK_SIZE.html
deleted file mode 100644
index f51f59c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_UPC_MAX_BLOCK_SIZE.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<h2><code>UPC_MAX_BLOCK_SIZE</code> identifier</h2>
-
-
-<h4>Description</h4>
-<p>
-<code>UPC_MAX_BLOCK_SIZE</code>  is a predefined integer constant value. It indicates the
-maximum value allowed in a layout qualifier for shared data. It shall be
-suitable for use in <code>#if</code> preprocessing directives.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/index.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/index.html
deleted file mode 100644
index 01bb476..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/index.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<h2 id="top">UPC Statements</h2>
-<ul>
-<li><a href="keywords.html">Keywords/Identifiers</a>
-<li><a href="keywords.html">Keywords</a>
-
-</ul>
-<h2 id="top">UPC functions</h2>
-<p>Termination of all threads
-<ul>
-<li><a href="upc_global_exit.html"> <code>upc_global_exit</code> </a>
-</ul>
-<p>Shared memory allocation functions
-<ul>
-<li><a href="upc_global_alloc.html"> <code>upc_global_alloc</code> </a>
-<li><a href="upc_all_alloc.html"> <code>upc_all_alloc</code> </a>
-<li><a href="upc_alloc.html"> <code>upc_alloc</code> </a>
-<li><a href="upc_local_alloc.html"> <code>upc_local_alloc</code> </a>  <i>deprecated</i>
-<li><a href="upc_free.html"> <code>upc_free</code> </a>
-</ul>
-
-<p>Pointer-to-shared manipulation functions
-<ul>
-<li><a href="upc_threadof.html"> <code>upc_threadof</code> </a>
-<li><a href="upc_phaseof.html"> <code>upc_phaseof</code> </a>
-<li><a href="upc_resetphase.html"> <code>upc_resetphase</code> </a>
-<li><a href="upc_addrfield.html"> <code>upc_addrfield</code> </a>
-<li><a href="upc_affinitysize.html"> <code>upc_affinitysize</code> </a>
-</ul>
-
-<p>Lock functions
-<ul>
-<li><a href="upc_lock_t.html"> <code>upc_lock_t</code> </a> &nbsp; type 
-<li><a href="upc_global_lock_alloc.html"> <code>upc_global_lock_alloc</code>  </a>
-<li><a href="upc_all_lock_alloc.html"> <code>upc_all_lock_alloc</code>  </a>
-<li><a href="upc_lock_free.html"> <code>upc_lock_free</code>  </a>
-<li><a href="upc_lock.html"> <code>upc_lock</code>  </a>
-<li><a href="upc_lock_attempt.html"> <code>upc_lock_attempt</code>  </a>
-<li><a href="upc_unlock.html"> <code>upc_unlock</code>  </a>
-</ul>
-
-<p>Shared string handling functions
-<ul>
-<li><a href="upc_memcpy.html"> <code>upc_memcpy</code> </a>
-<li><a href="upc_memget.html"> <code>upc_memget</code> </a>
-<li><a href="upc_memcpy.html"> <code>upc_memcpy</code> </a>
-<li><a href="upc_memset.html"> <code>upc_memset</code> </a>
-</ul>
-
-<p>Collective Utilities
-<ul>
-<li><a href="upc_all_broadcast.html"> <code>upc_all_broadcast</code> </a>
-<li><a href="upc_all_scatter.html"> <code>upc_all_scatter</code> </a>
-<li><a href="upc_all_gather.html"> <code>upc_all_gather</code> </a>
-<li><a href="upc_all_gather_all.html"> <code>upc_all_gather_all</code> </a>
-<li><a href="upc_all_exchange.html"> <code>upc_all_exchange</code> </a>
-<li><a href="upc_all_permute.html"> <code>upc_all_permute</code> </a>
-
-</ul>
-<p>
-See also <a href="terms.html">Terms, definitions, and symbols</a>
-<p>
-<a href="#top">Back to top</a>
\ No newline at end of file
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/keywords.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/keywords.html
deleted file mode 100644
index 1e21ac3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/keywords.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<h2>UPC Keywords/Identifiers</h2>
-<code>
-<ul>    
-<li><a href="id_MYTHREAD.html">MYTHREAD   </a>
-<li><a href="id_relaxed.html">relaxed       </a>
-<li><a href="id_shared.html">shared        </a>
-<li><a href="id_strict.html">strict       </a>
-<li><a href="id_THREADS.html">THREADS      </a>
-<li><a href="id_upc_barrier.html">upc_barrier         </a>
-<li><a href="id_upc_blocksizeof.html">upc_blocksizeof      </a>
-<li><a href="id_upc_elemsizeof.html">upc_elemsizeof      </a>
-<li><a href="id_upc_fence.html">upc_fence           </a>
-<li><a href="id_upc_localsizeof.html">upc_localsizeof   </a>
-<li><a href="id_UPC_MAX_BLOCKSIZE.html">UPC_MAX_BLOCKSIZE   </a>
-<li><a href="id_upc_notify.html">upc_notify   </a>
-<li><a href="id_upc_wait.html">upc_wait   </a>
-<li><a href="id_upc_forall.html">upc_forall        </a>     
-</ul>
-</code>
-
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/shared.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/shared.html
deleted file mode 100644
index f5fe38d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/shared.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<h2><code><code>shared</code></code> keyword</h2>
-
-
-<h4>Description</h4>
-<p>
-<code>shared</code> indicates a variable is shared between threads.
-<p>
-<pre>
-shared int i;
-shared [2] int a[200];
-strict shared int i;
-</pre>
-
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/terms.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/terms.html
deleted file mode 100644
index abfa250..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/terms.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<h4 id="top">UPC Terms, definitions and symbols</h4>
-<p>
-For the purpose of these specifications the following definitions apply.
-
-<dl>
-<dt><strong><strong>thread</strong></strong></dt>
-<dd>
-an instance of execution initiated by the execution environment at program
-startup.</dd>
-
-<dt><strong> </strong></dt>
-<dd> </dd>
-
-<dt><strong>object</strong></dt>
-<dd>
-region of data storage in the execution environment which can represent
-values.</dd>
-
-<dt><strong>shared object </strong></dt>
-<dd>
-an object allocated using a shared-qualified declarator or by a library function
-defined to create shared objects. 
-<p>Note: 
-All threads may access shared objects.</dd>
-
-<dt><strong>private object</strong></dt>
-<dd>
-any object which is not a shared object.
-<p>Note: Each thread declares and creates its own private objects which no
-other thread can access.</dd>
-<dt><strong> shared array</strong></dt>
-<dd>
-an array with elements that have shared qualified type.
-</dd>
-<dt><strong>affinity</strong></dt>
-<dd>
-logical association between shared objects and threads. Each element of data
-storage that contains shared objects has affinity to exactly one thread.
-</dd>
-<dt><strong>pointer-to-shared</strong></dt>
-<dd>
-a pointer whose referenced type is shared-qualified.
-</dd>
-<dt><strong> pointer-to-local</strong></dt>
-<dd>
-a pointer whose referenced type is not shared-qualified.
-</dd>
-<dt><strong>access</strong></dt>
-<dd>
-&lt;execution-time action&gt; to read or modify the value of an object by a thread.
-<p>The file scope declaration int y; creates a separate object for each thread to access.
-</dd>
-<dt><strong>shared access</strong></dt>
-<dd>
-an access using an expression whose type is shared-qualified.</dd>
-<dt><strong> strict shared read</strong></dt>
-<dd>
-a shared read access which is determined to be strict.</dd>
-<dt><strong>strict shared write</strong></dt>
-<dd>
-a shared modify access which is determined to be strict </dd>
-<dt><strong>relaxed shared read</strong></dt>
-<dd>
-a shared read access which is determined to be relaxed</dd>
-<dt><strong>relaxed shared write</strong></dt>
-<dd>
-a shared modify access which is determined to be relaxed </dd>
-<dt><strong>local access</strong></dt>
-<dd>
-an access using an expression whose type is not shared-qualified.
-</dd>
-<dt><strong>collective</strong></dt>
-<dd>
-a constraint placed on some language operations which requires evaluation
-of such operations to be matched across all threads. The behavior of collective
-operations is undefined unless all threads execute the same sequence of
-collective operations.</dd>
-<dt><strong>single-valued</strong></dt>
-<dd>
-an operand to a collective operation, which has the same value on every
-thread. The behavior of the operation is otherwise undefined.</dd>
-<dt><strong>phase</strong></dt>
-<dd>
-an unsigned integer value associated with a pointer-to-shared which indicates
-the element-offset within an affinity block; used in pointer-to-shared
-arithmetic to determine affinity boundaries</dd>
-</dl>
-<p>&nbsp
-<p>&nbsp
-<p><a href="#top">Back to  top</a>
-<p><a href="index.html">Back to index of all UPC functions</a>
\ No newline at end of file
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_addrfield.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_addrfield.html
deleted file mode 100644
index b4133e68..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_addrfield.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<h2>The <code>upc_addrfield</code> function</h2>
-
-<h4>Synopsis</h4>
-<pre>    
-    #include &lt;upc.h&gt;
-    size_t upc_addrfield(shared void *ptr);                 
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-The <code>upc_addrfield </code>  function returns an implementation-defined value reflecting
-the <q>local address</q>of the object pointed to by the pointer-to-shared
-argument.
-
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_affinitysize.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_affinitysize.html
deleted file mode 100644
index de6b81f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_affinitysize.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<h2>The <code>upc_affinitysize</code> function</h2>
-
-<h4>Synopsis</h4>
-<pre>    
-    #include &lt;upc.h&gt;
-    size_t upc_affinitysize(size_t totalsize, 
-                            size_t nbytes,
-                            size_t threadid);                
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-The <code>upc_affinitysize </code>  function is a convenience function which calculates the exact size
-of the local portion of the data in a shared object with affinity to <code>threadid</code>.
-<p>In the case of a dynamically allocated shared object, the <code>totalsize</code> argument
-shall be <code>nbytes*nblocks</code> and the <code>nbytes</code> argument shall be <code>nbytes</code>,
-where <code>nblocks</code> and <code>nbytes</code> are exactly as passed to <code>upc_global_alloc</code> or
-<code>upc_all_alloc</code> when the object was allocated.
-<p>In the case of a statically allocated shared object with declaration:
-<pre>
-   shared [b] t d[s];
-   </pre>
-the <code>totalsize</code> argument shall be <code>s * sizeof(t)</code> and the <code>nbytes</code> argument
-shall be <code>b * sizeof(t)</code>. If the block size is indefinite, <code>nbytes</code> shall be 0.
-<p><code>threadid</code> shall be a value in <code>0..(THREADS-1)</code>.
-
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_alloc.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_alloc.html
deleted file mode 100644
index 4cb0943..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_alloc.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<h2 >The <code>upc_all_alloc</code>     </h2>
-
-<h4>Synopsis</h4>
-<pre> 
-    #include &lt;upc.h&gt;
-    shared void *upc_all_alloc(size_t nblocks, 
-                               size_t nbytes);   
-</pre>
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_all_alloc   </code> function allocates shared space compatible with the following
-declaration:
-<p><code>
-shared [nbytes] char[nblocks * nbytes].
-</code></p>
-<p>
-The <code>upc_all_alloc   </code> function returns the same pointer value on all threads.
-If nblocks*nbytes is zero, the result is a null pointer-to-shared.
-<p>The dynamic lifetime of an allocated object extends from the time any thread
-completes the call to <code>upc_all_alloc   </code> until any thread has deallocated the
-object.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_broadcast.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_broadcast.html
deleted file mode 100644
index a34903c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_broadcast.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<h2>The <code>upc_all_broadcast</code> function</h2>
-<h4>Purpose</h4>
-<p>Copies a block of memory
-<h4>Synopsis</h4>
-<pre>    
-    #include &lt;upc.h&gt;
-    #include &lt;upc_collective.h&gt;
-    void upc_all_broadcast(shared void * restrict dst, shared const void * restrict src, size_t nbytes, upc_flag_t flags);             
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-The <code>upc_all_broadcast </code>  function  
-copies a block of memory with affinity to
-a single thread to a block of shared memory on each thread. The number of
-bytes in each block is <code>nbytes</code>.
-<p><code>nbytes</code> must be strictly greater than 0.
-<p><code>upc_all_broadcast </code> function treats the <code>src</code> pointer as if it pointed to a
-shared memory area with the type:
-<pre>
-    shared [] char[nbytes]
-    </pre>
-<p>The effect is equivalent to copying the entire array pointed to by <code>src</code> to each
-block of <code>nbytes</code> bytes of a shared array <code>dst</code> with the type:
-<pre>
-    shared [nbytes] char[nbytes * THREADS]
-</pre>
-<p>The target of the <code>dst</code> pointer must have affinity to thread 0.
-<p>The <code>dst</code> pointer is treated as if it has phase 0.
-
-<ul>
-<li>EXAMPLE 1 shows upc_all_broadcast
-
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-shared int A[THREADS];
-shared int B[THREADS];
-// Initialize A.
-upc_barrier;
-upc_all_broadcast( B, &A[1], sizeof(int),
-                   UPC_IN_NOSYNC | UPC_OUT_NOSYNC );
-upc_barrier;
-</pre>
-
-<li>EXAMPLE 2:
-
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared [] int A[NELEMS];
-shared [NELEMS] int B[NELEMS*THREADS];
-// Initialize A.
-upc_all_broadcast( B, A, sizeof(int)*NELEMS,
-                   UPC_IN_ALLSYNC | UPC_OUT_ALLSYNC );
-</pre>
-<li>EXAMPLE 3 shows <code>(A[3],A[4])</code> is broadcast to <code>(B[0],B[1]), (B[10],B[11]),
-(B[20],B[21]), ..., (B[NELEMS*(THREADS-1)],B[NELEMS*(THREADS-1)+1]).</code>
-
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared [NELEMS] int A[NELEMS*THREADS];
-shared [NELEMS] int B[NELEMS*THREADS];
-// Initialize A.
-upc_barrier;
-upc_all_broadcast( B, &A[3], sizeof(int)*2,
-                   UPC_IN_NOSYNC | UPC_OUT_NOSYNC );
-upc_barrier;
-</pre>
-</ul>
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_exchange.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_exchange.html
deleted file mode 100644
index ac50338..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_exchange.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<h2>The <code>upc_all_exchange</code> function     </h2>
-
-<h4>Synopsis</h4>
-<pre> 
-    #include &lt;upc.h&gt;
-    #include &lt;upc_collective.h&gt;
-    void upc_all_exchange(shared void * restrict dst, 
-                          shared const void * restrict src, 
-                          size_t nbytes, upc_flag_t flags);  
-    </pre>
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_all_exchange   </code> function   copies the ith block of memory from a shared
-memory area that has affinity to thread j to the jth block of a shared memory
-area that has affinity to thread i. The number of bytes in each block is
-<code>nbytes</code>.
-<p><code>nbytes</code> must be strictly greater than 0.
-<p>
-<p>The <code>upc_all_exchange   </code> function treats the <code>src</code> pointer and the <code>dst</code> pointer
-as if each pointed to a shared memory area of <code>nbytes * THREADS</code> bytes on each
-thread and therefore had type:
-<pre>
-    shared [nbytes * THREADS] char[nbytes * THREADS * THREADS]
-</pre>
-<p>The targets of the <code>src</code> and <code>dst</code> pointers must have affinity to thread 0.
-<p>The <code>src</code> and <code>dst</code> pointers are treated as if they have phase 0.
-<p>For each pair of threads i and j, the effect is equivalent to copying the ith
-block of <code>nbytes</code> bytes that has affinity to thread j pointed to by <code>src</code> to the
-jth block of <code>nbytes</code> bytes that has affinity to thread i pointed to by <code>dst</code>.
-<ul>
-<li>EXAMPLE 1 <code>upc_all_exchange   </code> for the static THREADS translation environment.
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared [NELEMS*THREADS] int A[THREADS][NELEMS*THREADS];
-shared [NELEMS*THREADS] int B[THREADS][NELEMS*THREADS];
-// Initialize A.
-upc_barrier;
-upc_all_exchange( B, A, NELEMS*sizeof(int),
-UPC_IN_NOSYNC | UPC_OUT_NOSYNC );
-upc_barrier;
-</pre>
-
-<li>EXAMPLE 2 <code>upc_all_exchange   </code> for the dynamic THREADS translation environment.
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared int *Adata, *Bdata;
-shared [] int *myA, *myB;
-int i;
-
-Adata = upc_all_alloc(THREADS*THREADS, NELEMS*sizeof(int));
-myA = (shared [] int *)&Adata[MYTHREAD];
-Bdata = upc_all_alloc(THREADS*THREADS, NELEMS*sizeof(int));
-myB = (shared [] int *)&Bdata[MYTHREAD];
-// Adata and Bdata contain THREADS*THREADS*NELEMS elements.
-// myA and myB are MYTHREAD's rows of Adata and Bdata, resp.
-// Initialize MYTHREAD's row of A. For example,
-for (i=0; i&lt;NELEMS*THREADS; i++)
-myA[i] = MYTHREAD*10 + i;
-upc_all_exchange( Bdata, Adata, NELEMS*sizeof(int),
-                  UPC_IN_ALLSYNC | UPC_OUT_ALLSYNC );
-</pre>
-</ul>
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_gather.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_gather.html
deleted file mode 100644
index e5e55ca..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_gather.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<h2>The <code>upc_all_gather</code> function</h2>
-
-<h4>Synopsis</h4>
-<pre>    
-    #include &lt;upc.h&gt;
-    #include &lt;upc_collective.h&gt;
-    void upc_all_gather(shared void * restrict dst, 
-                        shared const void * restrict src, 
-                        size_t nbytes, 
-                        upc_flag_t flags); 
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-The <code>upc_all_gather </code>  function 
-copies a block of shared memory that has
-affinity to the ith thread to the ith block of a shared memory area that has
-affinity to a single thread. The number of bytes in each block is <code>nbytes</code>.
-<p><code>nbytes</code> must be strictly greater than 0.
-<p>The upc all gather function treats the <code>src</code> pointer as if it pointed to a
-shared memory area of <code>nbytes</code> bytes on each thread and therefore had type:
-<pre>
-    shared [nbytes] char[nbytes * THREADS]
-</pre>
-<p>and it treats the <code>dst</code> pointer as if it pointed to a shared memory area with
-the type:
-<pre>
-    shared [] char[nbytes * THREADS]
-    </pre>
-<p>The target of the <code>src</code> pointer must have affinity to thread 0.
-<p>The <code>src</code> pointer is treated as if it has phase 0.
-<p>For each thread i, the effect is equivalent to copying the block of <code>nbytes</code> bytes
-pointed to by <code>src</code> that has affinity to thread i to the ith block of <code>nbytes</code>
-bytes pointed to by <code>dst</code>.
-<p>
-<ul>
-<li>EXAMPLE 1 <code>upc_all_gather </code> for the static THREADS translation environment.
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared [NELEMS] int A[NELEMS*THREADS];
-shared [] int B[NELEMS*THREADS];
-// Initialize A.
-upc_all_gather( B, A, sizeof(int)*NELEMS,
-UPC_IN_ALLSYNC | UPC_OUT_ALLSYNC );
-</pre>
-<li>EXAMPLE 2 <code>upc_all_gather </code> for the dynamic THREADS translation environment.
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared [NELEMS] int A[NELEMS*THREADS];
-shared [] int *B;
-B = (shared [] int *) upc_all_alloc(1,NELEMS*THREADS*sizeof(int));
-// Initialize A.
-upc_barrier;
-upc_all_gather( B, A, sizeof(int)*NELEMS,
-UPC_IN_NOSYNC | UPC_OUT_NOSYNC );
-upc_barrier;
-</pre>
-<li>
-<li>
-</ul>
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br><p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_gather_all.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_gather_all.html
deleted file mode 100644
index 4e3199e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_gather_all.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<h2>The <code>upc_all_gather_all</code> function</h2>
-
-<h4>Synopsis</h4>
-<pre>    
-    #include &lt;upc.h&gt;
-    #include &lt;upc_collective.h&gt;
-    void upc_all_gather_all(shared void * restrict dst,
-                            shared const void * restrict src, 
-                            size_t nbytes,
-                            upc_flag_t flags);
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-The <code>upc_all_gather_all </code>  function 
-copies a block of memory from one shared
-memory area with affinity to the ith thread to the ith block of a shared
-memory area on each thread. The number of bytes in each block is <code>nbytes</code>.
-<p><code>nbytes</code> must be strictly greater than 0.
-<p>The upc_all_gather_all function treats the <code>src</code> pointer as if it pointed to a
-shared memory area of <code>nbytes</code> bytes on each thread and therefore had type:
-<pre>
-shared [nbytes] char[nbytes * THREADS]
-</pre>
-<p>and it treats the <code>dst</code>  pointer as if it pointed to a shared memory area with
-the type:
-shared [nbytes * THREADS] char[nbytes * THREADS * THREADS]
-<p>The targets of the <code>src</code> and <code>dst</code> pointers must have affinity to thread 0.
-<p>The <code>src</code> and <code>dst</code>  pointers are treated as if they have phase 0.
-<p>The effect is equivalent to copying the ith block of <code>nbytes</code> bytes pointed to
-by <code>src</code> to the ith block of <code>nbytes</code> bytes pointed to by <code>dst</code> that has affinity
-to each thread.
-
-
-
-<p>
-<ul>
-<li> EXAMPLE 1 <code>upc_all_gather_all </code> for the static THREADS translation environment.
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared [NELEMS] int A[NELEMS*THREADS];
-shared [NELEMS*THREADS] int B[THREADS][NELEMS*THREADS];
-// Initialize A.
-upc_barrier;
-upc_all_gather_all( B, A, sizeof(int)*NELEMS,
-UPC_IN_NOSYNC | UPC_OUT_NOSYNC );
-upc_barrier;
-</pre>
-<li>EXAMPLE 2 <code>upc_all_gather_all </code> all for the dynamic THREADS translation
-environment.
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared [NELEMS] int A[NELEMS*THREADS];
-shared int *Bdata;
-shared [] int *myB;
-Bdata = upc_all_alloc(THREADS*THREADS, NELEMS*sizeof(int));
-myB = (shared [] int *)&Bdata[MYTHREAD];
-// Bdata contains THREADS*THREADS*NELEMS elements.
-// myB is MYTHREADÕs row of Bdata.
-// Initialize A.
-upc_all_gather_all( Bdata, A, NELEMS*sizeof(int),
-UPC_IN_ALLSYNC | UPC_OUT_ALLSYNC );
-</pre>
-<li>
-<li>
-</ul>
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_lock_alloc.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_lock_alloc.html
deleted file mode 100644
index 8262913..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_lock_alloc.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<h2 >The <code>upc_all_lock_alloc</code> function   </h2>
-
-<h4>Synopsis</h4>
-<pre> 
-    #include &lt;upc.h&gt;
-    upc_lock_t *upc_all_lock_alloc(void);                     
-</pre>
-
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_all_lock_alloc</code>    function dynamically allocates a lock and returns
-a pointer to it. The lock is created in an unlocked state.
-<p>The <code>upc_all_lock_alloc</code>  function is  a <i>collective</i> function. 
-The return value on every
-thread points to the same lock object.
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_permute.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_permute.html
deleted file mode 100644
index 86b93b4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_permute.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<h2>The <code>upc_all_permute</code> function</h2>
-
-<h4>Synopsis</h4>
-<pre>    
-    #include &lt;upc.h&gt;
-    #include &lt;upc_collective.h&gt;
-    void upc_all_permute(shared void * restrict dst,
-        shared const void * restrict src,
-        shared const int * restrict perm,
-        size_t nbytes, upc_flag_t flags);
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-The <code>upc_all_permute </code>  function 
-copies a block of memory from a shared memory
-area that has affinity to the ith thread to a block of a shared memory
-that has affinity to thread perm[i]. The number of bytes in each block is
-<code>nbytes</code>.
-<p><code>nbytes</code> must be strictly greater than 0.
-<p><code>perm[0..THREADS-1]</code> must contain <code>THREADS</code>
-distinct values: 
-<code>0, 1, ..., THREADS-1.</code>
-<p>The <code>upc_all_permute </code> function treats the <code>src</code> pointer and the <code>dst</code> pointer
-as if each pointed to a shared memory area of <code>nbytes</code> bytes on each thread
-and therefore had type:
-<pre>
-    shared [<code>nbytes</code>] char[<code>nbytes</code> * THREADS]
-    </pre>
-<p>The targets of the <code>src</code>, perm, and <code>dst</code> pointers must have affinity to thread 0.
-<p>The <code>src</code> and <code>dst</code> pointers are treated as if they have phase 0.
-<p>The effect is equivalent to copying the block of <code>nbytes</code> bytes that has affinity
-to thread i pointed to by <code>src</code> to the block of <code>nbytes</code> bytes that has affinity
-to thread perm[i] pointed to by <code>dst</code>.
-<ul>
-<li>EXAMPLE 1: <code>upc_all_permute</code>
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared [NELEMS] int A[NELEMS*THREADS], B[NELEMS*THREADS];
-shared int P[THREADS];
-// Initialize A and P.
-upc_barrier;
-upc_all_permute( B, A, P, sizeof(int)*NELEMS,
-UPC_IN_NOSYNC | UPC_OUT_NOSYNC );
-upc_barrier;
-</pre>
-
-</ul>
-
- 
-</ul>
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_scatter.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_scatter.html
deleted file mode 100644
index 5b21e92..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_scatter.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<h2>The <code>upc_all_scatter</code> function</h2>
-
-<h4>Synopsis</h4>
-<pre>    
-    #include &lt;upc.h&gt;
-    #include &lt;upc_collective.h&gt;
-    void upc_all_scatter(shared void * restrict dst, 
-                         shared const void * restrict src, 
-                         size_t nbytes, 
-                         upc_flag_t flags);
-               
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-The <code>upc_all_scatter </code>  function 
-copies the ith block of an area of shared
-memory with affinity to a single thread to a block of shared memory with
-affinity to the ith thread. The number of bytes in each block is <code>nbytes</code>.
-<p><code>nbytes</code> must be strictly greater than 0.
-<p>The <code>upc_all_scatter </code>  function treats the <code>src</code> pointer as if it pointed to a
-shared memory area with the type:
-<pre>
-    shared [] char[nbytes * THREADS]
- </pre>
-<p>and it treats the <code>dst</code> pointer as if it pointed to a shared memory area with
-the type:
-<pre>
-    shared [nbytes] char[nbytes * THREADS]
-</pre>
-<p>The target of the <code>dst</code> pointer must have affinity to thread 0.
-<p>The <code>dst</code> pointer is treated as if it has phase 0.
-<p>For each thread i, the effect is equivalent to copying the ith block of <code>nbytes</code>
-bytes pointed to by <code>src</code> to the block of <code>nbytes</code> bytes pointed to by 
-<code>dst</code> that
-has affinity to thread i.
-<ul>
-<li>EXAMPLE 1: <code>upc_all_scatter</code> for the dynamic THREADS translation environment.
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NUMELEMS 10
-#define SRC_THREAD 1
-shared int *A;
-shared [] int *myA, *srcA;
-shared [NUMELEMS] int B[NUMELEMS*THREADS];
-// allocate and initialize an array distributed across all threads
-A = upc_all_alloc(THREADS, THREADS*NUMELEMS*sizeof(int));
-myA = (shared [] int *) &A[MYTHREAD];
-for (i=0; i<NUMELEMS*THREADS; i++)
-myA[i] = i + NUMELEMS*THREADS*MYTHREAD; // (for example)
-// scatter the SRC_THREADÕs row of the array
-srcA = (shared [] int *) &A[SRC_THREAD];
-upc_barrier;
-upc_all_scatter( B, srcA, sizeof(int)*NUMELEMS,
-UPC_IN_NOSYNC | UPC_OUT_NOSYNC);
-upc_barrier;
-</pre>
-<li>EXAMPLE 2: <code>upc_all_scatter</code>  for the static THREADS translation environment.
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared [] int A[NELEMS*THREADS];
-shared [NELEMS] int B[NELEMS*THREADS];
- 
-// Initialize A.
-upc_all_scatter( B, A, sizeof(int)*NELEMS,
-UPC_IN_ALLSYNC | UPC_OUT_ALLSYNC );
-</pre>
- 
-</ul>
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_alloc.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_alloc.html
deleted file mode 100644
index 9f94bb0..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_alloc.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<h2 >The <code>upc_alloc</code> function    </h2>
-
-<h4>Synopsis</h4>
-<pre> 
-    #include &lt;upc.h&gt;
-    shared void *upc_alloc(size_t nbytes);                          
-</pre>
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_alloc  </code> allocates shared space of at least <code>nbytes</code> bytes with
-affinity to the calling thread.
-<p>
-<code>upc_alloc</code> is similar to malloc() except that it returns a pointer-to-shared
-value. It is not a <i>collective</i> function. If <code>nbytes</code> is zero, the result is a null
-pointer-to-shared.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_free.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_free.html
deleted file mode 100644
index 1dbf679..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_free.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<h2 >The <code>upc_free</code> function   </h2>
-<h4>Synopsis</h4>
-<pre> 
-    #include &lt;upc.h&gt;
-    void upc_free(shared void *ptr);                         
-</pre>
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_free </code>   function frees the dynamically allocated shared storage pointed
-to by <code>ptr</code>. If <code>ptr</code> is a null pointer, no action occurs. Otherwise, if the
-argument does not match a pointer earlier returned by the 
-<a href="upc_alloc.html"><code>upc_alloc</code></a>,
-<a href="upc_global_alloc.html"><code>upc_global_alloc</code></a>,
-<a href="upc_all_alloc.html"><code>upc_all_alloc</code></a>, or 
-<a href="upc_local_alloc.html"><code>upc_local_alloc</code></a>
-function, or if the
-space has been deallocated by a previous call, by any thread 
-(i.e., only one thread may call <code>upc_free </code> for each allocation),
-to <code>upc_free</code>,
-the behavior is undefined.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_alloc.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_alloc.html
deleted file mode 100644
index 8373525..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_alloc.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<h2 >upc_global_alloc</h2>
-
-<h4>Synopsis</h4>
-<p>
-<pre>
-    #include &lt;upc.h&gt;
-    shared void *upc_global_alloc(size_t nblocks, 
-                                  size_t nbytes);
-</pre>
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_global_alloc</code> allocates shared space compatible with the declaration:
-<p>
-<code>
-shared [nbytes] char[nblocks * nbytes]</code>
-<p>
-<code>upc_global_alloc</code> function is not a collective function. If called by
-multiple threads, all threads which make the call get different allocations. If
-<code>nblocks*nbytes</code> is zero, the result is a null pointer-to-shared.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_exit.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_exit.html
deleted file mode 100644
index 4b2f998..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_exit.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<h2 >The <code>upc_global_exit</code> function </h2>
-<h4>Synopsis</h4>
-<pre>
-    #include &lt;upc.h&gt;
-    void upc_global_exit(int status);
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-<code>upc_global_exit() </code>
-flushes all I/O, releases all storage, and terminates the
-execution for all active threads.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
-
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_lock_alloc.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_lock_alloc.html
deleted file mode 100644
index e4e35ff..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_lock_alloc.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<h2 >The <code>upc_global_lock_alloc</code> function   </h2>
-<h4>Synopsis</h4>
-<p>
-
-<pre> 
-    #include &lt;upc.h&gt;
-    upc_lock_t *upc_global_lock_alloc(void);                      
-</pre>
-
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_global_lock_alloc </code>   function dynamically allocates a lock and returns
-a pointer to it. The lock is created in an unlocked state.
-<p>The <code>upc_global_lock_alloc </code> function is not a <i>collective</i> function.  If called
-by multiple threads, all threads which make the call get different allocations.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_local_alloc.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_local_alloc.html
deleted file mode 100644
index 5247a1a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_local_alloc.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<h2 >The <code>upc_local_alloc</code> function &nbsp;&nbsp; <i>deprecated</i> </h2>
-
-<h4>Synopsis</h4>
-<p>
-<pre> 
-    #include &lt;upc.h&gt;
-    shared void *upc_local_alloc(size_t nblocks, 
-                                 size_t nbytes);                          
-</pre>
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_local_alloc </code> function is deprecated and should not be used. UPC
-programs should use the <code>upc_alloc </code> function instead. Support may be removed
-in future versions of this specification.
-<p>
-The <code>upc_local_alloc </code> function allocates shared space of at least 
-<code>nblocks * nbytes </code> bytes with affinity to the calling thread. If 
-<code>nblocks * nbytes </code>  is zero,
-the result is a null pointer-to-shared.
-<p>
-<code>upc_local_alloc </code> is similar to malloc() except that it returns a pointer-to-shared
-value. It is not a <i>collective</i> function.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock.html
deleted file mode 100644
index b10919e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<h2 >The <code>upc_lock</code> function   </h2>
-
-<h4>Synopsis</h4>
-<p>
-
-<pre> 
-    #include &lt;upc.h&gt;
-    void upc_lock(upc_lock_t *ptr);                  
-</pre>
-
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_lock</code>    function  sets the state of the lock pointed to by <code>ptr</code> to locked.
-<p>If the lock is already in locked state due to the calling thread setting it to
-locked state, the result is undefined.
-<p>If the lock is already in locked state, then the calling thread waits for some
-other thread to set the state to unlocked. 
-<p>Once the lock is in state unlocked, a single calling thread sets the state to
-locked and the function returns.
-<p>A null strict access is implied after a call to upc_lock().
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_attempt.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_attempt.html
deleted file mode 100644
index 7f92a9b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_attempt.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<h2 >The <code>upc_lock_attempt</code> function   </h2>
-
-<h4>Synopsis</h4>
-<p>
-
-<pre> 
-    #include &lt;upc.h&gt;
-    int upc_lock_attempt(upc_lock_t *ptr);               
-</pre>
-
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_lock_attempt</code>    function  attempts to set the state of the lock pointed
-to by <code>ptr</code> to locked.
-<p>If the lock is already in locked state due to the calling thread setting it to
-locked state, the result is undefined.
-<p>If the lock is already in locked state the function returns 0.
-<p>If the lock is in state unlocked, a single calling thread sets the state to locked
-and the function returns 1.
-<p>A null strict access is implied after a call to upc_lock_attempt() that returns
-1.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_free.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_free.html
deleted file mode 100644
index c56d3f3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_free.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<h2 >The <code>upc_lock_free</code> function   </h2>
-
-<h4>Synopsis</h4>
-<p>
-
-<pre> 
-    #include &lt;upc.h&gt;
-    upc_lock_t *upc_lock_free(upc_lock_t *ptr);                     
-</pre>
-
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_lock_free</code>    function  frees all resources associated with the dynamically
-allocated <code>upc_lock_t</code> pointed to by <code>ptr</code>. 
-If <code>ptr</code> is a null pointer, no
-action occurs. 
-Otherwise, if the argument does not match a pointer earlier
-returned by the <code>upc_global_lock_alloc</code> or 
-<code>upc_all_lock_alloc</code> function,
-or if the lock has been deallocated by a previous call to <code>upc_lock_free</code>,
-the behavior is undefined.
-<p>
-<code>upc_lock_free</code> succeeds regardless of whether the referenced lock is currently
-unlocked or currently locked (by any thread).
-<p>Any subsequent calls to locking functions from any thread using <code>ptr</code> have
-undefined effects. This also applies to any thread currently calling <code>upc_lock</code>.
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_t.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_t.html
deleted file mode 100644
index 42aa596..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_t.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<h2>The <code>upc_lock_t</code> type</h2>
-
-<h4>Synopsis</h4>
-<p>The type declared is
-<pre>   
-    upc_lock_t               
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-The type <code>upc_lock_t </code>  is an opaque UPC type. <code>upc_lock_t </code> is a shared
-datatype with incomplete type (as defined in [ISO/IEC00 Sec 6.2.5]). 
-Objects
-of type <code>upc_lock_t </code> may therefore only be manipulated through pointers.
-Such objects have two states called locked and unlocked.
-<p>Two pointers to that reference the same lock object will compare as equal.
-The results of applying upc_phaseof(), upc_threadof(), and upc_addrfield()
-to such pointers are undefined.
-
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memcpy.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memcpy.html
deleted file mode 100644
index c5e4af6..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memcpy.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<h2 >The <code>upc_memcpy</code> function   </h2>
-
-<h4>Synopsis</h4>
-<p>
-
-<pre> 
-    #include &lt;upc.h&gt;
-    void upc_memcpy(shared void * restrict dst, 
-                    shared const void * restrict src, 
-                    size_t n);
-                    
-</pre>
-
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_memcpy</code>    function  copies n characters from a shared object having
-affinity with one thread to a shared object having affinity with the same or
-another thread.
-<p>The <code>upc_memcpy</code> function treats the <code>dst</code> and <code>src</code> pointers as if 
-they had type:
-<pre>
-    shared [] char[n]
-</pre>
-The effect is equivalent to copying the entire contents from one shared array
-object with this type (the <code>src</code> array) to another shared array object with
-this type (the <code>dst</code> array).
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memget.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memget.html
deleted file mode 100644
index 6cbc444..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memget.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<h2 >The <code>upc_memget</code> function   </h2>
-
-<h4>Synopsis</h4>
-<p>
-
-<pre> 
-    #include &lt;upc.h&gt;
-    void upc_memget(void * restrict dst, 
-                    shared const void * restrict src, 
-                    size_t n);
-                    
-</pre>
-
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_memget</code>    function  copies n characters from a shared object with affinity
-to any single thread to an object on the calling thread.
-<p>The <code>upc_memget</code> function treats the <code>src</code> pointer as if it had type:
-<pre>
-    shared [] char[n]
-    </pre>
-The effect is equivalent to copying the entire contents from one shared array
-object with this type (the <code>src</code> array) to an array object (the <code>dst</code> array)
-declared with the type
-<pre>
-    char[n]
-</pre>
-
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memset.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memset.html
deleted file mode 100644
index 184d820..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memset.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<h2 >The <code>upc_memset</code> function   </h2>
-
-<h4>Synopsis</h4>
-<p>
-
-<pre> 
-    #include &lt;upc.h&gt;
-    void upc_memset(shared void *dst, 
-                    int c, 
-                    size_t n);
-                    
-</pre>
-
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_memset</code>    function  copies the value of c, converted to an unsigned
-char, to a shared object with affinity to any single thread. The number of
-bytes set is n.
-<p>The <code>upc_memset</code>  function treats the <code>dst</code> pointer as if had type:
-<pre>
-    shared [] char[n]
-</pre>
-    
-The effect is equivalent to setting the entire contents of a shared array object
-with this type (the <code>dst</code> array) to the value c.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_phaseof.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_phaseof.html
deleted file mode 100644
index bee4bfa..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_phaseof.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<h2>The <code>upc_phaseof</code> function</h2>
-
-<h4>Synopsis</h4>
-<pre>    #include &lt;upc.h&gt;
-    size_t upc_phaseof(shared void *ptr);                          
-</pre>
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_phaseof </code> function  returns the phase component of the pointer-to-shared
-argument.
-<p>If <code>ptr</code> is a null pointer-to-shared, the function returns 0.
-
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_resetphase.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_resetphase.html
deleted file mode 100644
index 8327802..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_resetphase.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<h2>The <code>upc_resetphase</code> function</h2>
-
-<h4>Synopsis</h4>
-<pre>    
-    #include &lt;upc.h&gt;
-    shared void *upc_resetphase(shared void *ptr);                     
-</pre>
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_resetphase </code> function   returns a pointer-to-shared which is identical
-to its input except that it has zero phase.
-
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_threadof.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_threadof.html
deleted file mode 100644
index a0b410b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_threadof.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<h2 >The <code>upc_threadof</code> function &nbsp;&nbsp; </h2>
-
-<h4>Synopsis</h4>
-<p>
-<pre> 
-    #include &lt;upc.h&gt;
-    size_t upc_threadof(shared void *ptr);                        
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-The <code>upc_threadof </code>function returns the index of the thread that has affinity
-to the shared object pointed to by <code>ptr</code>.
-<p>
-If <code>ptr</code> is a null pointer-to-shared, the function returns 0.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_unlock.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_unlock.html
deleted file mode 100644
index 112d0ab..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_unlock.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<h2 >The <code>upc_unlock</code> function   </h2>
-
-<h4>Synopsis</h4>
-<p>
-
-<pre> 
-    #include &lt;upc.h&gt;
-    void upc_unlock(upc_lock_t *ptr);              
-</pre>
-
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_unlock</code>    function  sets the state of the lock pointed to by <code>ptr</code> to
-unlocked.
-<p>Unless the lock is in locked state and the calling thread is the locking thread,
-the result is undefined.
-<p>A null strict access is implied before a call to upc unlock().
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/icons/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.upc/icons/.cvsignore
deleted file mode 100644
index 32f2eb8..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/icons/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-pspbrwse.jbf
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/icons/upc.gif b/tools/pldt/org.eclipse.ptp.pldt.upc/icons/upc.gif
deleted file mode 100644
index daa8733..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/icons/upc.gif
+++ /dev/null
Binary files differ
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/plugin.properties b/tools/pldt/org.eclipse.ptp.pldt.upc/plugin.properties
deleted file mode 100644
index c2dffb7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/plugin.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-#    test plugin.properties
-# These names will be used in plugin.xml 
-#
-
-view.name=UPC Artifact View
-viewcat.name=PTP UPC Views
-run.label=Run UPC Analysis
-run.tooltip=Run UPC Analysis on selected file, folder, or project to find UPC Artifacts
-
-#need to add more
\ No newline at end of file
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/plugin.xml b/tools/pldt/org.eclipse.ptp.pldt.upc/plugin.xml
deleted file mode 100644
index f6ff444..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/plugin.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   
-   <extension
-         point="org.eclipse.ui.preferencePages">
-         <page
-            class="org.eclipse.ptp.pldt.upc.prefs.UPCPreferencePage"
-            id="org.eclipse.ptp.pldt.upc.prefpage"
-            category="org.eclipse.ptp.pldt.common.prefs.PLDTPreferencePage"
-            name="UPC"/>
-         
-   </extension>
-
-   <!--  UPC markers -->
-   <extension point="org.eclipse.core.resources.markers"
-		id="upcMarker"
-        name="upc Artifact Marker">
-      <super type="org.eclipse.core.resources.textmarker"/>
-   </extension>
-   <!-- this changes the marker image in the editor marker bar  -->
-   <extension
-         point="org.eclipse.ui.editors.annotationTypes">
-      <type
-            markerType="org.eclipse.ptp.pldt.upc.upcMarker"
-            name="org.eclipse.ptp.pldt.upc.upcMarkerAnnotation">
-      </type>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors.markerAnnotationSpecification">
-      <specification
-            annotationType="org.eclipse.ptp.pldt.upc.upcMarkerAnnotation"
-            icon="icons/upc.gif" 
-            
-            presentationLayer="3"
-            label="upc Annotation Marker"
-            
-            textPreferenceKey="upcIndication"
-            textPreferenceValue="true"
-            highlightPreferenceKey="artifactHighlighting"
-            highlightPreferenceValue="false"
-            colorPreferenceKey="artifactIndicationColor"
-            colorPreferenceValue="128,128,192"
-            verticalRulerPreferenceKey="artifactIndicationInVerticalRuler"
-            verticalRulerPreferenceValue="true"
-			showInNextPrevDropdownToolbarActionKey="showPortingInNextPrevDropdownToolbarAction"
-            showInNextPrevDropdownToolbarAction="false"
-            overviewRulerPreferenceKey="artifactIndicationInOverviewRuler"
-            overviewRulerPreferenceValue="true"
-            
-            includeOnPreferencePage="true"
-            isGoToPreviousNavigationTargetKey="isPortingGoToPreviousNavigationTarget"
-
-            isGoToNextNavigationTargetKey="isPortingRecordGoToNextNavigationTarget"
-            >
-      </specification>  
-   </extension>
-   <extension
-         point="org.eclipse.ui.views">
-      <category
-            name="%viewcat.name"
-            id="org.eclipse.ptp.pldt.upc">
-      </category>
-      <view
-            name="%view.name"
-            icon="icons/upc.gif"
-            category="org.eclipse.ptp.pldt.upc"
-            class="org.eclipse.ptp.pldt.upc.views.UPCArtifactView"
-            id="org.eclipse.ptp.pldt.upc.views.upcArtifactView">
-      </view>
-   </extension>
-   <extension
-         point="org.eclipse.cdt.ui.CHelpProvider">
-      <provider
-            class="org.eclipse.ptp.pldt.upc.editorHelp.UPCCHelpInfoProvider"
-            id="org.eclipse.ptp.pldt.upc.editorHelp.UPCCHelpInfoProvider"/>
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            defaultHandler="org.eclipse.ptp.pldt.upc.actions.RunAnalyseUPCcommandHandler"
-            id="org.eclipse.ptp.pldt.upc.command2"
-            name="find upc artifacts">
-      </command>
-   </extension>
-      <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            locationURI="menu:org.eclipse.ptp.pldt.common.toolbar.command1 ">
-         <command
-               commandId="org.eclipse.ptp.pldt.upc.command2"
-               icon="icons/upc.gif"
-               label="Show UPC Artifacts">
-         </command>
-      </menuContribution>
-   </extension>
-</plugin>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCArtifactMarkingVisitor.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCArtifactMarkingVisitor.java
deleted file mode 100644
index e3df505..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCArtifactMarkingVisitor.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.upc;
-
-import org.eclipse.ptp.pldt.common.ArtifactMarkingVisitor;
-
-public class UPCArtifactMarkingVisitor extends ArtifactMarkingVisitor
-{
-    public UPCArtifactMarkingVisitor(String markerId)
-    {
-        super(markerId);
-    }
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCIDs.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCIDs.java
deleted file mode 100644
index 7dc4ee7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCIDs.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.upc;
-
-/**
- * UPC Plugin constants
- * 
- * @author Beth Tibbitts
- */
-public interface UPCIDs
-{
-    // preference page name for UPC
-    String UPC_INCLUDES    = "UPC Includes";
-    
-    String MARKER_ID       = "org.eclipse.ptp.pldt.upc.upcMarker";
-    String MARKER_ERROR_ID = "org.eclipse.ptp.pldt.upc.upcErrorMarker";
-    
-    // artifact view id
-    String UPC_VIEW_ID = "org.eclipse.ptp.pldt.upc.views.upcArtifactView";
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCPlugin.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCPlugin.java
deleted file mode 100644
index 3b67f07..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCPlugin.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.upc;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class UPCPlugin extends AbstractUIPlugin {
-
-	/** The shared instance. */
-	private static UPCPlugin plugin;
-	public static final String PLUGIN_ID = "org.eclipse.ptp.pldt.upc";
-	
-	/**
-	 * The constructor.
-	 */
-	public UPCPlugin() {
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static UPCPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.ptp.pldt.upc", path);
-	}
-    
-    /**
-     * Returns the preference setting for UPC include paths
-     * 
-     * @return
-     */
-    public List<String> getUPCIncludeDirs()
-    {
-        String stringList = getPluginPreferences().getString(UPCIDs.UPC_INCLUDES);
-        StringTokenizer st = new StringTokenizer(stringList, File.pathSeparator + "\n\r");//$NON-NLS-1$
-        List<String> dirs = new ArrayList<String>();
-        while (st.hasMoreElements()) {
-            dirs.add(st.nextToken());
-        }
-        return dirs;
-    }
-    
-    public static String getPluginId()
-    {
-        return PLUGIN_ID;
-    }
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/actions/RunAnalyseUPCcommandHandler.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/actions/RunAnalyseUPCcommandHandler.java
deleted file mode 100644
index 93c9356..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/actions/RunAnalyseUPCcommandHandler.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.upc.actions;
-
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.model.ITranslationUnit;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.actions.RunAnalyseHandlerBase;
-import org.eclipse.ptp.pldt.common.util.ViewActivater;
-import org.eclipse.ptp.pldt.upc.UPCArtifactMarkingVisitor;
-import org.eclipse.ptp.pldt.upc.UPCIDs;
-import org.eclipse.ptp.pldt.upc.UPCPlugin;
-import org.eclipse.ptp.pldt.upc.analysis.UPCCASTVisitor;
-
-/**
- * The "Find UPC Artifacts" action/command
- * @author Beth Tibbitts
- *
- */
-public class RunAnalyseUPCcommandHandler extends RunAnalyseHandlerBase
-{
-	/**
-	 * Constructor for the "Run Analysis" action
-	 */
-	public RunAnalyseUPCcommandHandler() {
-		super("UPC", new UPCArtifactMarkingVisitor(UPCIDs.MARKER_ID), UPCIDs.MARKER_ID); //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns UPC analysis artifacts for file
-	 * 
-	 * @param file
-	 * @param includes
-	 *            UPC include paths
-	 * @return
-	 */
-	@Override
-	public ScanReturn doArtifactAnalysis(final ITranslationUnit tu,	final List<String> includes) {
-		final ScanReturn msr = new ScanReturn();
-		final String fileName = tu.getElementName();
-		ILanguage lang;
-		try {
-			lang = tu.getLanguage();
-            
-			IASTTranslationUnit atu = tu.getAST();
-			if (lang.getId().equals(UPCLanguage.ID)) {// cdt40
-				atu.accept(new UPCCASTVisitor(includes, fileName, msr));
-			} 
-
-		} catch (CoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return msr;
-	}
-
-	/**
-	 * Determination of whether or not a given filename is valid for UPC artifact analysis
-	 * <br>TODO  Consider using language or content-type instead of file extension?
-	 * Re-visit after https://bugs.eclipse.org/bugs/show_bug.cgi?id=237331 is resolved (UPC  content-type not recognized)
-	 * 
-	 * @param filename
-	 * @param isCPP  is the project a C++ project or not
-	 * @return
-	 * 
-	 */
-	@Override
-	protected boolean validForAnalysis(String filename, boolean isCPP) {
-		int loc = filename.lastIndexOf(".");
-		if (loc <= 0) // if no dot, or filename is ".foo", not valid for
-						// analysis.
-			return false;
-		String ext = filename.substring(loc + 1);
-		ext = ext.toLowerCase();
-		boolean result = true;
-		if (ext.equals("upc")) 
-			result = true;
-		else
-			result = false;
-		return result;
-	}
-	@Override
-	protected List<String> getIncludePath() {
-		return UPCPlugin.getDefault().getUPCIncludeDirs();
-	}
-	@Override
-	protected void activateArtifactView() {
-		ViewActivater.activateView(UPCIDs.UPC_VIEW_ID);
-	}
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/analysis/UPCCASTVisitor.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/analysis/UPCCASTVisitor.java
deleted file mode 100644
index 21e72b9..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/analysis/UPCCASTVisitor.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.upc.analysis;
-
-
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionCallExpression;
-import org.eclipse.cdt.core.dom.ast.IASTIdExpression;
-import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.analysis.PldtAstVisitor;
-
-/**
- * This dom-walker collects "artifacts" related to the specific domain <br>
- * (e.g. UPC). Currently these artifacts include function calls
- * and constants. It add markers to the source file for C code, marking the
- * position of the artifacts found.
- * 
- * This version extends PldtAstVisitor instead of delegating to<br>
- * MpiGeneralASTVisitorBehavior.
- *
- * @author tibbitts
- * 
- */
-public class UPCCASTVisitor extends PldtAstVisitor 
-{
-    private static final String PREFIX="upc_";
-
-    {
-        this.shouldVisitExpressions = true;
-        this.shouldVisitStatements = true;
-        this.shouldVisitDeclarations = true;
-        this.shouldVisitTranslationUnit = true;
-    }
-
-    public UPCCASTVisitor(List upcIncludes, String fileName, ScanReturn msr)
-    {
-        super(upcIncludes, fileName, msr);
-		ARTIFACT_CALL = "UPC Call";
-		ARTIFACT_CONSTANT="UPC Constant";
-    }
-
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTExpression)
-     */
-    public int visit(IASTExpression expression)
-    {
-        if (expression instanceof IASTFunctionCallExpression) {
-            IASTExpression astExpr = ((IASTFunctionCallExpression) expression).getFunctionNameExpression();
-            String signature = astExpr.getRawSignature();
-            //System.out.println("func signature=" + signature);
-            if (signature.startsWith(PREFIX)) {
-                if (astExpr instanceof IASTIdExpression) {
-                    IASTName funcName = ((IASTIdExpression) astExpr).getName();
-                    processFuncName(funcName, astExpr);
-                }
-            }
-        } else if (expression instanceof IASTLiteralExpression) {
-            processMacroLiteral((IASTLiteralExpression) expression);
-        }
-        return PROCESS_CONTINUE;
-    }
-}
\ No newline at end of file
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/editorHelp/UPCCHelpBook.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/editorHelp/UPCCHelpBook.java
deleted file mode 100644
index cbba937..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/editorHelp/UPCCHelpBook.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.upc.editorHelp;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.cdt.ui.IFunctionSummary;
-import org.eclipse.ptp.pldt.common.editorHelp.CHelpBookImpl;
-import org.eclipse.ptp.pldt.common.editorHelp.FunctionPrototypeSummaryImpl;
-import org.eclipse.ptp.pldt.common.editorHelp.FunctionSummaryImpl;
-import org.eclipse.ptp.pldt.upc.UPCPlugin;
-
-/**
- * UPC help book - this is the information that is used for the hover help
- * <p>
- * <b>Note:</b> This (and F1/dynamic help as well) requires a fix to CDT post-5.0.0 release
- * to org.eclipse.cdt.internal.core.model.TranslationUnit  - to recognize content-type of UPC to be a deriviative ("kindOf") the C content type.
- * <p>See https://bugs.eclipse.org/bugs/show_bug.cgi?id=237331  
- * @author Beth Tibbitts
- *
- */
-public class UPCCHelpBook extends CHelpBookImpl {
-	private static final String TITLE = "UPC C Help Book";
-	private Map<String,String> desc=new HashMap<String, String>();
-
-	
-	public UPCCHelpBook() {
-        super(UPCPlugin.getPluginId());
-        // populate description map - this just makes the funcName2FuncInfo init lines a bit more terse
-      
-        desc.put("upc_addrfield", "Returns an implementation-defined value reflecting the <q>local address</q>of the object pointed to by the pointer-to-shared argument.");
-        desc.put("upc_affinitysize", "A convenience function which calculates the exact size of the local portion of the data in a shared object with affinity to <code>threadid</code>.");
-        desc.put("upc_all_alloc", "Allocates shared space");
-        desc.put("upc_all_broadcast", "Copies a block of memory with affinity to a single thread to a block of shared memory on each thread.");
-        desc.put("upc_all_lock_alloc", "Dynamically allocates a lock and returns a pointer to it. The lock is created in an unlocked state.");
-        desc.put("upc_all_exchange", "Copies the ith block of memory from a shared memory area that has affinity to thread j to the jth block of a shared memory area that has affinity to thread i");
-        desc.put("upc_all_gather",     "Copies a block of shared memory that has affinity to the ith thread to the ith block of a shared memory area that has affinity to a single thread.");
-        desc.put("upc_all_gather_all", "Copies a block of memory from one shared memory area with affinity to the ith thread to the ith block of a shared memory area on each thread.");
-        desc.put("upc_all_lock_alloc", "Dynamically allocates a lock and returns a pointer to it. The lock is created in an unlocked state.");
-        desc.put("upc_all_permute", "Copies a block of memory from a shared memory area that has affinity to the ith thread to a block of a shared memory that has affinity to thread perm[i].");
-        desc.put("upc_all_scatter", "Copies the ith block of an area of shared memory with affinity to a single thread to a block of shared memory with affinity to the ith thread.");
-        desc.put("upc_alloc", "Allocates shared space of at least nbytes with affinity to the calling thread.");      
-        desc.put("upc_free", "Frees dynamically allocated shared storage");
-        desc.put("upc_global_alloc","Allocates shared space");
-        desc.put("upc_global_exit","Flushes all I/O, releases all storage, and terminates the execution for all active threads.");
-        desc.put("upc_global_lock_alloc", "Dynamically allocates a lock and returns a pointer to it. The lock is created in an unlocked state.");
-        desc.put("upc_local_alloc","Deprecated. Use upc_alloc instead.\nAllocates shared space.");      
-        desc.put("upc_lock_attempt", "Attempts to set the state of a lock to locked. Return code indicates previous state.");
-        desc.put("upc_lock_free", "Frees all resources associated with a lock.");
-        desc.put("upc_lock_t", "UPC type for a lock");
-        desc.put("upc_lock", "Sets the state of a lock to locked.");
-        desc.put("upc_memcpy", "Copies n characters from a shared object having affinity with one thread to a shared object having affinity with the same or another thread.");
-        desc.put("upc_memget", "Copies n characters from a shared object with affinity to any single thread to an object on the calling thread.");
-        desc.put("upc_memset", "Copies a value, converted to an unsigned char, to a shared object with affinity to any single thread.");
-        desc.put("upc_phaseof", "Returns the phase component of the pointer-to-shared argument.");
-        desc.put("upc_resetphase", "Returns a pointer-to-shared which is identical to its input except that it has zero phase");
-        desc.put("upc_threadof", "Returns the index of the thread that has affinity to the shared object pointed to by the argument.");
-        desc.put("upc_unlock", "Sets the state of a lock to unlocked."); 
-        desc.put("shared", "this is a shared UPC keyword");
-        
-        
-		// populate func map
-        //funcName2FuncInfo.put("upc_free", new FunctionSummaryImpl("upc_free", "", "upc_free test description",
-        //        new FunctionPrototypeSummaryImpl("upc_free", "void", "shared void *ptr"), null));
-        String desc = ""; // will do map lookup for description in fps method.
-        funcName2FuncInfo.put("upc_addrfield", fps("upc_addrfield", "", desc, "size_t", "shared void *ptr"));
-        funcName2FuncInfo.put("upc_affinitysize", fps("upc_affinitysize", "", desc, "size_t", "size_t totalsize, size_t nbytes, size_t threadid"));
-        funcName2FuncInfo.put("upc_all_alloc", fps("upc_all_alloc", "", desc, "void", "size_t nblocks, size_t nbytes"));
-        funcName2FuncInfo.put("upc_all_broadcast", fps("upc_all_broadcast", "", desc, "void", "shared void * restrict dst, shared const void * restrict src, size_t nbytes, upc_flag_t flags"));
-        funcName2FuncInfo.put("upc_all_exchange", fps("upc_all_exchange", "", desc, "void", "shared void * restrict dst, shared const void * restrict src, size_t nbytes, upc_flag_t flags"));
-        funcName2FuncInfo.put("upc_all_gather_all", fps("upc_all_gather_all", "", desc, "void", "shared void * restrict dst, shared const void * restrict src, size_t nbytes, upc_flag_t flags"));
-        funcName2FuncInfo.put("upc_all_gather", fps("upc_all_gather", "", desc, "void", "shared void * restrict dst, shared const void * restrict src, size_t nbytes, upc_flag_t flags"));      		
-        funcName2FuncInfo.put("upc_all_lock_alloc", fps("upc_all_lock_alloc", "", desc, "upc_lock_t", "void"));
-        funcName2FuncInfo.put("upc_all_permute", fps("upc_all_permute", "", desc, "void", "shared void * restrict dst, shared const void * restrict src, shared const int * restrict perm, size_t nbytes, upc_flag_t flags"));
-        funcName2FuncInfo.put("upc_all_scatter", fps("upc_all_scatter", "", desc, "void", "shared void * restrict dst, shared const void * restrict src, size_t nbytes, upc_flag_t flags"));
-        funcName2FuncInfo.put("upc_alloc", fps("upc_alloc", "", desc, "void", "size_t nbytes"));      
-        funcName2FuncInfo.put("upc_free", fps("upc_free", "", desc, "void", "shared void *ptr"));
-        funcName2FuncInfo.put("upc_global_alloc", fps("upc_global_alloc", "", desc, "void", "int status"));
-        funcName2FuncInfo.put("upc_global_exit", fps("upc_global_exit", "", desc, "void", "int status"));
-        funcName2FuncInfo.put("upc_global_lock_alloc", fps("upc_global_lock_alloc", "", desc, "upc_lock_t", "void"));
-        funcName2FuncInfo.put("upc_local_alloc", fps("upc_local_alloc", "", desc, "void", "size_t nblocks, size_t nbytes"));    
-        funcName2FuncInfo.put("upc_lock_attempt", fps("upc_lock_attempt", "", desc, "int", "upc_lock_t *ptr"));
-        funcName2FuncInfo.put("upc_lock_free", fps("upc_lock_free", "", desc, "upc_lock_t", "void"));
-        funcName2FuncInfo.put("upc_lock", fps("upc_lock", "", desc, "void", "upc_lock_t *ptr"));
-        funcName2FuncInfo.put("upc_memcpy", fps("upc_memcpy", "", desc, "void", "shared void * restrict dst, shared const void * restrict src, size_t n"));      
-        funcName2FuncInfo.put("upc_memget", fps("upc_memget", "", desc, "void", "void * restrict dst, shared const void * restrict src, size_t n"));
-        funcName2FuncInfo.put("upc_memset", fps("upc_memset", "", desc, "void", "shared void *dst, int c, size_t n"));
-        funcName2FuncInfo.put("upc_phaseof", fps("upc_memset", "", desc, "size_t", "shared void *ptr"));     
-        funcName2FuncInfo.put("upc_resetphase", fps("upc_resetphase", "", desc, "void", "shared void *ptr"));
-        funcName2FuncInfo.put("upc_threadof", fps("upc_threadof", "", desc, "size_t", "shared void *ptr"));
-        funcName2FuncInfo.put("upc_unlock", fps("upc_unlock", "", desc, "void", "upc_lock_t *ptr"));
-        funcName2FuncInfo.put("shared", fps("shared", "", desc, "", ""));
-        
-        // set title
-        setTitle(TITLE);
-	}
-	
-	/**
-	 * Convenience function for inputting these FunctionPrototypeSummary and FunctionSummary arguments.
-	 * @param name
-	 * @param namespace
-	 * @param description if empty will do lookup in Map
-	 * @param returnType
-	 * @param args
-	 * @return
-	 */
-	protected IFunctionSummary fps(String name, String namespace, String description, String returnType, String args){
-		if(description==null || description.length()==0) {
-			description=getDesc(name);
-		}
-		IFunctionSummary fps = new FunctionSummaryImpl(name, namespace, description,
-                new FunctionPrototypeSummaryImpl(name, returnType, args), null);
-		return fps;
-	}
-	protected String getDesc(String key) {
-		String description = (String)desc.get(key);
-		if(description==null)
-			description=key+" description";
-		return description;
-	}
-	
-	/**
-	 * Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=237331
-	 * ("CHelpProvider not called for UPC")
-	 * so that UPC help will get called.
-	 * CDT bug fix required for this to work otherwise.
-	 * For example, in TranslationUnit to make the UPC type 'inherit' from the C type.
-	 * <p>
-	 * This returns an invalid number as a workaround.
-	 * This will cause the default part of the switch in CHelpBookDescriptor.matches()
-	 * to execute and the UPC help will
-	 * match for all files. Not pretty but it will work for now.
-	 * @see org.eclipse.cdt.internal.core.model.TranslationUnit
-	 * 
-	 */
-	@SuppressWarnings("restriction")// just for the javadoc comment to not get warning :)
-	@Override
-	public int getCHelpType() {
-		return -1;
-	}
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/editorHelp/UPCCHelpInfoProvider.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/editorHelp/UPCCHelpInfoProvider.java
deleted file mode 100644
index 3268b36..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/editorHelp/UPCCHelpInfoProvider.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.upc.editorHelp;
-
-import org.eclipse.ptp.pldt.common.editorHelp.CHelpProviderImpl;
-
-/**
- * 
- * This class implements ICHelpProvider and provides UPC information <br>
- * (F1, hover, content assist, etc.)
-  * <p>
- * <b>Note:</b> This  requires a fix to CDT post-5.0.0 release
- * to org.eclipse.cdt.internal.core.model.TranslationUnit  - to recognize content-type of UPC to be a deriviative ("kindOf") the C content type.
- * <p>See https://bugs.eclipse.org/bugs/show_bug.cgi?id=237331  
- * <p>Further note: a workaround has been applied in UCCCHelpBook to not require the CDT patch
- * 
- * 
- * @author Beth Tibbitts
- *
- */
-public class UPCCHelpInfoProvider extends CHelpProviderImpl {
-
-	public UPCCHelpInfoProvider() {
-		//System.out.println("UPCCHelpInfoProvider ctor()...");//debug only , to see when called
-	}
-
-	public void initialize() {
-		helpBook = new UPCCHelpBook();
-		//System.out.println("UPCCHelpInfoProvider initialize()...");
-	}
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/prefs/UPCPreferencePage.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/prefs/UPCPreferencePage.java
deleted file mode 100644
index e1d49b8..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/prefs/UPCPreferencePage.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.upc.prefs;
-
-
-
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PathEditor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.pldt.upc.UPCIDs;
-import org.eclipse.ptp.pldt.upc.UPCPlugin;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-/**
- * Preference page based on FieldEditorPreferencePage
- * 
- * @author xue
- */
-
-public class UPCPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage
-{
-    private static final String INCLUDES_PREFERENCE_LABEL  = "UPC include paths:";
-    private static final String INCLUDES_PREFERENCE_BROWSE = "Please choose a directory:";
-    private static final String UPC_HELP="Location of UPC help files:";
-    private static final String UPC_HELP_DEFAULT="Use default";
-    private static final String UPC_HELP_DEFAULT_ID="upcHelpUseDefault";
-    //private static final String UPC_HELP_LINUX="Use Linux location: ";
-    //private static final String UPC_HELP_AIX="Use AIX location: ";
-    //private static final String UPC_HELP_OTHER="Other:";
-    //private static final String UPC_HELP_OTHER_ID="upcHelpOther";
-    
-    //private static final String UPC_LOCATION_AIX="/opt/rsct/lapi/eclipse/help";
-    //private static final String UPC_LOCATION_LINUX="opt/ibmhpc/lapi/eclipse/help";
-    
-    private static final String UPC_WHICH_HELP_ID="default";  // alternatives are: default, aix, linux, other
-
-    public UPCPreferencePage()
-    {
-        super(FLAT);
-        initPreferenceStore();
-    }
-
-    public UPCPreferencePage(int style)
-    {
-        super(style);
-        initPreferenceStore();
-    }
-
-    public UPCPreferencePage(String title, ImageDescriptor image, int style)
-    {
-        super(title, image, style);
-        initPreferenceStore();
-    }
-
-    public UPCPreferencePage(String title, int style)
-    {
-        super(title, style);
-        initPreferenceStore();
-    }
-
-    /**
-     * Init preference store and set the preference store for the preference page
-     */
-    private void initPreferenceStore()
-    {
-        IPreferenceStore store = UPCPlugin.getDefault().getPreferenceStore();
-        setPreferenceStore(store);
-    }
-
-    public void init(IWorkbench workbench)
-    {
-    }
-
-    protected void createFieldEditors()
-    {
-        PathEditor pathEditor = new PathEditor(UPCIDs.UPC_INCLUDES, INCLUDES_PREFERENCE_LABEL,
-                INCLUDES_PREFERENCE_BROWSE, getFieldEditorParent());
-        addField(pathEditor);
-
-        //"Use default?"
-//        BooleanFieldEditor bed = new BooleanFieldEditor(UPC_HELP_DEFAULT_ID,UPC_HELP_DEFAULT,getFieldEditorParent());
-//        addField(bed);
-  /*      
-        int numCol=1;
-    	RadioGroupFieldEditor choiceFE = new RadioGroupFieldEditor(UPC_WHICH_HELP_ID, UPC_HELP, numCol, new String[][] {
-				{ UPC_HELP_DEFAULT, "choice1" }, 
-				{ UPC_HELP_AIX+UPC_LOCATION_AIX, "choice2" }, 
-				{ UPC_HELP_LINUX+UPC_LOCATION_LINUX, "Choice3" },
-				{ UPC_HELP_OTHER, "Choice4" }},
-				getFieldEditorParent());
-    	addField(choiceFE);
-    	
-    	StringFieldEditor otherLoc=new StringFieldEditor(UPC_HELP_OTHER_ID, UPC_HELP_OTHER,getFieldEditorParent());
-    	addField(otherLoc);
-    	*/
-    	
-    }
-    
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/views/UPCArtifactView.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/views/UPCArtifactView.java
deleted file mode 100644
index cd728d5..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/views/UPCArtifactView.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.upc.views;
-
-import org.eclipse.ptp.pldt.common.views.SimpleTableMarkerView;
-import org.eclipse.ptp.pldt.upc.UPCIDs;
-import org.eclipse.ptp.pldt.upc.UPCPlugin;
-
-
-
-/**
- * A UPC artifact view based on SimpleTableView <br>
- * Note that the ID must be unique.
- * 
- */
-public class UPCArtifactView extends SimpleTableMarkerView
-{
-    public UPCArtifactView()
-    {
-        // if you need to read icon images, etc. from the plug-in, be sure to pass
-        // in an actual Plugin class instance for first arg
-        super(UPCPlugin.getDefault(), "UPC Artifact", "UPC Artifacts", "Construct", UPCIDs.MARKER_ID);
-    }
-}
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/.classpath b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/.project b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/.project
deleted file mode 100644
index 5b6f673..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.sampleCDTstaticAnalysis</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/META-INF/MANIFEST.MF b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/META-INF/MANIFEST.MF
deleted file mode 100644
index 2984ab7..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Sample CDT Static Analysis
-Bundle-SymbolicName: org.eclipse.ptp.pldt.sampleCDTstaticAnalysis;singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.ptp.pldt.sampleCDTstaticAnalysis.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.cdt.core,
- org.eclipse.core.resources,
- org.eclipse.ptp.pldt.common,
- org.eclipse.ptp.pldt.mpi.analysis,
- org.eclipse.ptp.pldt.mpi.analysis.cdt
-Eclipse-LazyStart: true
-Bundle-Vendor: IBM Research
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/build.properties b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/build.properties
deleted file mode 100644
index 0d3d3a7..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               icons/
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/calls.gif b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/calls.gif
deleted file mode 100644
index 695e5a5..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/calls.gif
+++ /dev/null
Binary files differ
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/callsC.gif b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/callsC.gif
deleted file mode 100644
index 469fa25..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/callsC.gif
+++ /dev/null
Binary files differ
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/callsCF.gif b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/callsCF.gif
deleted file mode 100644
index 4433b19..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/callsCF.gif
+++ /dev/null
Binary files differ
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/class_hi.gif b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/class_hi.gif
deleted file mode 100644
index 17f927e..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/class_hi.gif
+++ /dev/null
Binary files differ
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/graphC.gif b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/graphC.gif
deleted file mode 100644
index 905c338..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/graphC.gif
+++ /dev/null
Binary files differ
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/graphW.gif b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/graphW.gif
deleted file mode 100644
index 23b294b..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/graphW.gif
+++ /dev/null
Binary files differ
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/sample.gif b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/sample.gif
+++ /dev/null
Binary files differ
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/plugin.xml b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/plugin.xml
deleted file mode 100644
index 6ba6e75..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/plugin.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
-   <extension
-         point="org.eclipse.ui.commands">
-      <category
-            name="Sample Category"
-            id="cdtAST2.commands.category">
-      </category>
-      <command
-            name="CallGraph Command"
-            categoryId="cdtAST2.commands.category"
-            id="cdtAST2.commands.cgCommand">
-      </command>
-       <command
-            name="CFG Command"
-            categoryId="cdtAST2.commands.category"
-            id="cdtAST2.commands.cfgCommand">
-      </command>
-   </extension>
-   <extension
-         point="org.eclipse.ui.handlers">
-      <handler
-            commandId="cdtAST2.commands.cgCommand"
-            class="org.eclipse.ptp.pldt.sampleCDTstaticAnalysis.handlers.BuildCallGraphHandler">
-      </handler>
-      <handler
-            commandId="cdtAST2.commands.cfgCommand"
-            class="org.eclipse.ptp.pldt.sampleCDTstaticAnalysis.handlers.BuildCFGraphHandler">
-      </handler>
-   </extension>
-   <extension
-         point="org.eclipse.ui.bindings">
-      <key
-            commandId="cdtAST2.commands.cgCommand"
-            contextId="org.eclipse.ui.contexts.window"
-            sequence="M1+6"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>
-   </extension>
-   <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            locationURI="menu:org.eclipse.ui.main.menu?after=additions">
-         <menu
-               label="Sample Menu"
-               mnemonic="M"
-               id="cdtAST2.menus.sampleMenu">
-            <command
-                  commandId="cdtAST2.commands.cgCommand"
-                  icon="icons/graphW.gif"
-                  id="cdtAST2.menus.cgCommand"
-                  label="Walk AST tree"
-                  mnemonic="S"
-                  tooltip="Walk AST Tree tooltip">
-            </command>
-         </menu>
-      </menuContribution>
-      <menuContribution
-            locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
-         <toolbar
-               id="cdtAST2.toolbars.sampleToolbar">
-            <command
-                  commandId="cdtAST2.commands.cgCommand"
-                  icon="icons/callsC.gif"
-                  id="cdtAST2.toolbars.buildCallGraphCommand"
-                  label="Build Call Graph"
-                  tooltip="Build Call Graph">
-            </command>
-             <command
-                  commandId="cdtAST2.commands.cfgCommand"
-                  icon="icons/callsCF.gif"
-                  id="cdtAST2.toolbars.buildCallGraphCommand"
-                  label="Build CFGraph"
-                  tooltip="Build Control Flow Graph">
-            </command>
-         </toolbar>
-      </menuContribution>
-   </extension>
-   <extension
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            label="Sample Action Set"
-            visible="true"
-            id="cdtAST2.actionSet">
-         <action
-               label="Walk AST"
-               icon="icons/graphW.gif"
-               class="org.eclipse.ptp.pldt.sampleCDTstaticAnalysis.actions.ASTWalkerAction"
-               tooltip="Walk AST tooltip"
-               menubarPath="sampleMenu/sampleGroup"
-               toolbarPath="sampleGroup"
-               id="cdtast2.actions.SampleAction">
-         </action>
-      </actionSet>
-   </extension>
-
-</plugin>
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/Activator.java b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/Activator.java
deleted file mode 100644
index 5b260ca..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/Activator.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.eclipse.ptp.pldt.sampleCDTstaticAnalysis;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "cdtAST2";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-}
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/actions/ASTWalkerAction.java b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/actions/ASTWalkerAction.java
deleted file mode 100644
index 56323bc..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/actions/ASTWalkerAction.java
+++ /dev/null
@@ -1,402 +0,0 @@
-package org.eclipse.ptp.pldt.sampleCDTstaticAnalysis.actions;
-
-import java.util.Iterator;
-
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression;
-import org.eclipse.cdt.core.dom.ast.IASTComment;
-import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement;
-import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorIncludeStatement;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorStatement;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.ast.IType;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit.IDependencyTree;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit.IDependencyTree.IASTInclusionNode;
-import org.eclipse.cdt.core.model.ICElement;
-import org.eclipse.cdt.core.model.ICElementVisitor;
-import org.eclipse.cdt.core.model.ITranslationUnit;
-import org.eclipse.cdt.internal.core.dom.parser.c.CASTExpressionStatement;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-/**
- * This was initially built from the "Sample Action" plugin example.
- * 
- * This sample action walks an AST tree for a selected C source file.
- * Select a C source file in the Projects view and click the icon in the toolbar
- * to print AST walking information.
- * 
- * @see IWorkbenchWindowActionDelegate
- * 
- * @author Beth Tibbitts tibbitts@us.ibm.com
- */
-public class ASTWalkerAction implements IWorkbenchWindowActionDelegate {
-	private IWorkbenchWindow window;
-	private IStructuredSelection selection;
-
-	/**
-	 * The constructor.
-	 */
-	public ASTWalkerAction() {
-	}
-
-	/**
-	 * The action has been activated. The argument of the method represents the
-	 * 'real' action sitting in the workbench UI.
-	 * 
-	 * @see IWorkbenchWindowActionDelegate#run
-	 */
-	public void run(IAction action) {
-		MessageDialog.openInformation(window.getShell(), "CdtAST2 Plug-in",
-				"See Console for AST walking results");
-		try {
-			runSelectionExample(selection);
-		} catch (CoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Selection in the workbench has been changed. We can change the state of
-	 * the 'real' action here if we want, but this can only happen after the
-	 * delegate has been created.
-	 * 
-	 * @see IWorkbenchWindowActionDelegate#selectionChanged
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		if (selection instanceof IStructuredSelection) {
-			this.selection = (IStructuredSelection) selection;
-		}
-
-	}
-
-	public void runSelection(ISelection selection) {
-		System.out.println("selection=" + selection);
-		if (selection instanceof ITranslationUnit) {
-			System.out.println("   ITranslationUnit");
-		}
-		if (selection instanceof ICElement) {
-			System.out.println("ICElement");
-			walkICElement((ICElement) selection);
-
-		}
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection ss = (IStructuredSelection) selection;
-			// System.out.println(" IStructuredSelection, contents:");
-
-			for (Iterator iter = ss.iterator(); iter.hasNext();) {
-				Object obj = (Object) iter.next();
-				// It can be a Project, Folder, File, etc...
-				if (obj instanceof IAdaptable) {
-					IAdaptable iad = (IAdaptable) obj;
-					final IResource res = (IResource) iad
-							.getAdapter(IResource.class);
-					System.out.println("     got resource: " + res);
-
-					// ICElement covers folders and translationunits
-					final ICElement ce = (ICElement) iad
-							.getAdapter(ICElement.class);// cdt40
-					System.out.println("     got ICElement: " + ce);
-
-					ITranslationUnit tu = (ITranslationUnit) iad
-							.getAdapter(ITranslationUnit.class);
-					System.out.println("     got ITranslationUnit: " + tu);
-					try {
-						listFlatInfo(tu);
-						walkITU(tu);
-					} catch (CoreException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
-			}// end for
-		}
-	}
-
-	public void runSelectionExample(ISelection selection) throws CoreException {
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection ss = (IStructuredSelection) selection;
-			for (Iterator iter = ss.iterator(); iter.hasNext();) {
-				Object obj = (Object) iter.next();
-				// It can be a Project, Folder, File, etc...
-				if (obj instanceof IAdaptable) {
-					IAdaptable iad = (IAdaptable) obj;
-					final IResource res = (IResource) iad
-							.getAdapter(IResource.class);
-					System.out.println("     got resource: " + res);
-
-					// ICElement covers folders and translation units
-					final ICElement ce = (ICElement) iad
-							.getAdapter(ICElement.class);// cdt40
-					System.out.println("     got ICElement: " + ce);
-
-					ITranslationUnit tu = (ITranslationUnit) iad
-							.getAdapter(ITranslationUnit.class);
-					System.out.println("     got ITranslationUnit: " + tu);
-					System.out.println("\n==========listFlatInfo():");
-					listFlatInfo(tu);
-					System.out.println("\n==========walkITU():");
-					walkITU(tu);
-					System.out.println("\n==========walkITU_AST():");
-					walkITU_AST(tu);
-
-				}
-			}
-		}
-	}
-
-	/**
-	 * We can use this method to dispose of any system resources we previously
-	 * allocated.
-	 * 
-	 * @see IWorkbenchWindowActionDelegate#dispose
-	 */
-	public void dispose() {
-	}
-
-	/**
-	 * We will cache window object in order to be able to provide parent shell
-	 * for the message dialog.
-	 * 
-	 * @see IWorkbenchWindowActionDelegate#init
-	 */
-	public void init(IWorkbenchWindow window) {
-		this.window = window;
-	}
-
-	public void walkICElement(ICElement ice) {
-		// ICElement ice = (ICElement)selection;
-		String eName = ice.getElementName();
-		System.out.println("ICElement name: " + eName);
-
-	}
-
-	/**
-	 * Walk the ITranslationUnit with a visitor, which (only) visits ICElements
-	 * 
-	 * @param tu
-	 * @throws CoreException
-	 */
-	private void walkITU(ITranslationUnit tu) throws CoreException {
-		String tuName = tu.getElementName();
-		System.out.println("ITranslationUnit name: " + tuName);
-		tu.accept(new ICElementVisitor() {
-			public boolean visit(ICElement element) throws CoreException {
-				boolean visitChildren = true;
-				System.out.println("Visiting: " + element.getElementName());
-				return visitChildren;
-			}
-		});
-		System.out.println("AST visitor for " + tuName);
-		IASTTranslationUnit ast = tu.getAST();
-		ast.accept(new MyASTVisitor());
-	}
-
-	/**
-	 * Walk the IASTTranslationUnit's AST tree, which can visit many types of
-	 * nodes
-	 * 
-	 * @param tu
-	 * @throws CoreException
-	 */
-	private void walkITU_AST(ITranslationUnit tu) throws CoreException {
-		System.out.println("AST visitor for " + tu.getElementName());
-		IASTTranslationUnit ast = tu.getAST();
-		System.out
-				.println("\n=================MyASTVisitor2 also implements leave() \n");
-		ast.accept(new MyASTVisitor2());
-	}
-
-	class MyASTVisitor extends ASTVisitor {
-
-		MyASTVisitor() {
-			this.shouldVisitStatements = true; // lots more
-			this.shouldVisitDeclarations = true;
-		}
-
-		public int visit(IASTStatement stmt) { // lots more
-			String sig = stmt.getRawSignature();
-			if (sig.length() > 0)
-				System.out.println("Visiting stmt: " + stmt.getRawSignature());
-			else if (stmt instanceof IASTCompoundStatement) {
-				IASTCompoundStatement cstmt = (IASTCompoundStatement) stmt;
-				IASTStatement[] stmts = cstmt.getStatements();
-				System.out.println("Visiting compound stmt with stmts: "
-						+ stmts.length);
-				for (IASTStatement st : stmts) {
-					String rawSig = st.getRawSignature();
-
-					if (rawSig.length() == 0) {
-						System.out.println("   ->" + st);
-						if (st instanceof CASTExpressionStatement) {
-							CASTExpressionStatement es = (CASTExpressionStatement) st;
-							IASTExpression exp = es.getExpression();
-							if (exp instanceof IASTBinaryExpression) {
-								IASTBinaryExpression bexp = (IASTBinaryExpression) exp;
-
-								System.out.println("    binary exp: "
-										+ bexp.getOperand1() + " "
-										+ bexp.getOperator() + " "
-										+ bexp.getOperand2());
-							}
-							String expStr = exp.getRawSignature();
-							IType type = exp.getExpressionType();
-						}
-					} else {
-						System.out.println("   ->" + rawSig);
-					}
-				}
-			}
-			return PROCESS_CONTINUE;
-		}
-
-		public int visit(IASTDeclaration decl) {
-			System.out.println("Visiting decl: " + decl.getRawSignature());
-			return PROCESS_CONTINUE;
-		}
-
-	}
-
-
-	/** Visitor that uses leave() to show nesting */
-	class MyASTVisitor2 extends ASTVisitor {
-
-		MyASTVisitor2() {
-			this.shouldVisitStatements = true;
-			this.shouldVisitDeclarations = true;
-			this.shouldVisitNames = true;
-		}
-
-		/**
-		 * Print statement info: if altered by preprocessor, then
-		 * getRawSignature() is empty; use alternate representation
-		 */
-		public int visit(IASTStatement stmt) {
-			String sig = stmt.getRawSignature();
-			if (sig.length() > 0)
-				System.out.println("Visiting stmt: " + stmt.getRawSignature());
-			else
-				System.out.println("Visiting stmt: " + stmt.toString());
-			return PROCESS_CONTINUE;
-		}
-
-		public int visit(IASTDeclaration decl) {
-			System.out.println("Visiting decl: " + decl.getRawSignature());
-			return PROCESS_CONTINUE;
-		}
-
-		public int visit(IASTName name) {
-			String prtName = name.toString();
-			if (prtName.length() == 0)
-				prtName = name.getRawSignature(); // use pre pre-processor
-			// value
-			System.out.println("Visiting name: " + prtName);
-			return PROCESS_CONTINUE;
-		}
-
-		public int leave(IASTStatement stmt) {
-			System.out.println(" Leaving stmt: " + stmt.getRawSignature());
-			return PROCESS_CONTINUE;
-		}
-
-		public int leave(IASTDeclaration decl) {
-			System.out.println(" Leaving decl: " + decl.getRawSignature());
-			return PROCESS_CONTINUE;
-		}
-
-		public int leave(IASTName name) {
-			System.out.println(" Leaving name: " + name);// possibly empty
-			return PROCESS_CONTINUE;
-		}
-	}
-
-	/**
-	 * List "flat info" type queries that return lists of things on the ast
-	 * 
-	 * @param tu
-	 * @throws CoreException
-	 */
-	void listFlatInfo(ITranslationUnit tu) throws CoreException {
-		IASTTranslationUnit ast = tu.getAST();
-
-		System.out.println("AST for: " + ast.getContainingFilename());
-
-		IASTPreprocessorStatement[] ppss = ast.getAllPreprocessorStatements();
-		System.out.println("PreprocessorStmts: (omit /usr/...)");
-		for (int i = 0; i < ppss.length; i++) {
-			IASTPreprocessorStatement pps = ppss[i];
-			String fn = pps.getContainingFilename();
-			if (!fn.startsWith("/usr")) {
-				System.out.println(i + "  PreprocessorStmt: " + lastpart(fn)
-						+ " " + pps.getRawSignature());
-			}
-		}
-		IASTDeclaration[] decls = ast.getDeclarations();
-		System.out.println("Declarations: (omit /usr/...)");
-		for (int i = 0; i < decls.length; i++) {
-			IASTDeclaration decl = decls[i];
-			String fn = decl.getContainingFilename();
-			if (!fn.startsWith("/usr")) {
-				System.out.println(i + "  Declaration: " + lastpart(fn) + " "
-						+ decl.getRawSignature());
-			}
-		}
-		IASTPreprocessorStatement[] idirs = ast.getIncludeDirectives();
-		// recurses thru includes included by other includes...
-		System.out.println("Include directives: ");
-		for (int i = 0; i < idirs.length; i++) {
-			IASTPreprocessorStatement idir = idirs[i];
-			System.out.println(i + " include directive: " + idir);
-
-		}
-
-		IDependencyTree dt = ast.getDependencyTree();
-		IASTInclusionNode[] ins = dt.getInclusions();
-		// this lists only the includes immediately included by this src file
-		System.out.println("Dependency tree/Include statements:");
-		for (int i = 0; i < ins.length; i++) {
-			IASTInclusionNode in = ins[i];
-			IASTPreprocessorIncludeStatement is = in.getIncludeDirective();
-			System.out.println(i + "  include stmt: " + is);
-		}
-		// note: comments are not available as AST Nodes but are available here.
-		// (In spite of the existence of IASTComment class and visit(IASTComment) method.)
-		// These are deprecated in CDT 5.0
-		ast = tu.getAST(null,ITranslationUnit.AST_CREATE_COMMENT_NODES);
-		IASTComment[] cmts = ast.getComments();
-		System.out.println("Comments found: "+cmts.length);
-		for (int i = 0; i < cmts.length; i++) {
-			IASTComment comment = cmts[i];
-			char[] cmtChar=comment.getComment();
-			String cmtStr=String.valueOf(cmtChar);
-			
-			System.out.println(i + " Comment: [" + cmtStr + "] rawSig: ["+comment.getRawSignature()+"] line "
-					+ comment.getFileLocation());
-
-		}
-
-	}
-
-	/**
-	 * Return last part of string pathname: e.g. a/b/c/foo.c returns foo.c
-	 * 
-	 * @param pathname
-	 * @return
-	 */
-	String lastpart(String pathname) {
-		int loc = pathname.lastIndexOf('/');
-		return pathname.substring(loc + 1);
-	}
-}
\ No newline at end of file
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/handlers/BuildCFGraphHandler.java b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/handlers/BuildCFGraphHandler.java
deleted file mode 100644
index 624ad8e..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/handlers/BuildCFGraphHandler.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package org.eclipse.ptp.pldt.sampleCDTstaticAnalysis.handlers;
-
-import java.util.Iterator;
-
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.GraphCreator;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.IBlock;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraph;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraphNode;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.IControlFlowGraph;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.impl.ControlFlowGraph;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-/**
- * Build Control Flow Graph
- * 
- * @author Beth Tibbitts  tibbitts@us.ibm.com
- *  
- * @see org.eclipse.core.commands.IHandler
- * @see org.eclipse.core.commands.AbstractHandler
- * @see org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.GraphCreator
- */
-public class BuildCFGraphHandler extends AbstractHandler implements
-		ISelectionListener {
-	private IStructuredSelection selection;
-	protected ICallGraph callGraph;
-	protected GraphCreator graphCreator;
-	protected IWorkbenchWindow window;
-
-	/**
-	 * The constructor.
-	 */
-	public BuildCFGraphHandler() {
-		graphCreator = new GraphCreator();
-
-	}
-
-	/**
-	 * Execute the command: extract extract the needed information from the
-	 * application context. <br>
-	 * A new call graph is constructed for the selected resources.
-	 * 
-	 * @param event
-	 * @return the result of the execution. Reserved for future use by IHandler
-	 *         interface, must be <code>null</code>.
-	 */
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		window = HandlerUtil.getActiveWorkbenchWindowChecked(event);
-		System.out.println("BuildCFGraphHandler.execute()");
-		// create an empty call graph to begin with
-		callGraph = graphCreator.initCallGraph();
-		// Get the current selection
-		if (selection == null) {
-			ISelection sel = HandlerUtil.getCurrentSelection(event);
-			if (sel instanceof IStructuredSelection) {
-				selection = (IStructuredSelection) sel;
-			}
-			if (selection == null) {
-				message("No selection detected. Please select a file, folder, or project in the Projects View.");
-				selection=null;
-				return null;
-			}
-		}
-
-		// We iterate here only to handle the possibility of multiple-selection.
-		// graphCreator will descend into child nodes.
-		/*final*/ IResource res=null;
-		for (Iterator iter = selection.iterator(); iter.hasNext();) {
-			Object obj = (Object) iter.next();
-			// It can be a Project, Folder, File, etc...
-			if (obj instanceof IAdaptable) {
-				IAdaptable iad = (IAdaptable) obj;
-				res = (IResource) iad.getAdapter(IResource.class);
-				// Note: put this in a Job or WorkspaceModifyOperation if resources
-				// will be changed.
-				if (res != null) {
-					callGraph = graphCreator.initCallGraph(res);
-				} else {
-					message("Please select a file, folder, or project in the Projects view");
-					selection=null;
-					return null;
-				}
-			}
-		}
-
-		graphCreator.computeCallGraph(callGraph);
-		// get the first node
-		ICallGraphNode topNode = callGraph.topEntry();
-		String topName=topNode.getFuncName();
-		
-		ICallGraphNode firstNode=callGraph.getAllNodes().get(0);
-		String firstName=firstNode.getFuncName();
-		// get a node by function name
-		ICallGraphNode namedNode = callGraph.getNode(res.getName(), "foo");
-		String namedName="";
-		if(namedNode!=null) {
-			namedName=namedNode.getFuncName();
-		}
-		
-		ICallGraphNode node = topNode;
-		IASTStatement funcBody=node.getFuncDef().getBody();
-		IControlFlowGraph cfg = new ControlFlowGraph(funcBody);
-		cfg.buildCFG();
-		
-		IBlock entryBlock = cfg.getEntry();
-		for (IBlock block= cfg.getEntry(); block!=null; block = block.getTopNext()) {
-			block.print();
-		}
-		return null;
-	}
-
-	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-		if (selection instanceof IStructuredSelection) {
-			this.selection = (IStructuredSelection) selection;
-			System.out.println("BuildCallGraphHandler got selection");
-		}
-
-	}
-
-	public void message(String msg) {
-		MessageDialog.openInformation(window.getShell(),
-				"Houston, we have a problem", msg);
-	}
-}
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/handlers/BuildCallGraphHandler.java b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/handlers/BuildCallGraphHandler.java
deleted file mode 100644
index d5c6861..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/handlers/BuildCallGraphHandler.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.eclipse.ptp.pldt.sampleCDTstaticAnalysis.handlers;
-
-import java.util.Iterator;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.GraphCreator;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraph;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-/**
- * This handler extends AbstractHandler, an IHandler base class. This handler
- * builds a call graph for the selected resource(s) in the Project Explorer view. <br>
- * 
- * Two steps to building call graph: <br>
- * 1. collect all function definitions in the call graph <br>
- * 2. construct the caller and callee relationship among the CallGraphNodes
- * <br>Most of the work is done by GraphCreator
- * 
- * @author Beth Tibbitts tibbitts@us.ibm.com
- * 
- * @see org.eclipse.core.commands.IHandler
- * @see org.eclipse.core.commands.AbstractHandler
- * @see org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.GraphCreator
- */
-public class BuildCallGraphHandler extends AbstractHandler implements
-		ISelectionListener {
-	private IStructuredSelection selection;
-	protected ICallGraph callGraph;
-	protected GraphCreator graphCreator;
-	protected IWorkbenchWindow window;
-
-	/**
-	 * The constructor.
-	 */
-	public BuildCallGraphHandler() {
-		graphCreator = new GraphCreator();
-
-	}
-
-	/**
-	 * Execute the command: extract extract the needed information from the
-	 * application context. <br>
-	 * A new call graph is constructed for the selected resources.
-	 * 
-	 * @param event
-	 * @return the result of the execution. Reserved for future use by IHandler
-	 *         interface, must be <code>null</code>.
-	 */
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		window = HandlerUtil.getActiveWorkbenchWindowChecked(event);
-		System.out.println("BuildCallGraphHandler.execute()");
-		// create an empty call graph to begin with
-		callGraph = graphCreator.initCallGraph();
-		// Get the current selection
-		if (selection == null) {
-			ISelection sel = HandlerUtil.getCurrentSelection(event);
-			if (sel instanceof IStructuredSelection) {
-				selection = (IStructuredSelection) sel;
-			}
-			if (selection == null) {
-				message("No selection detected. Please select a file, folder, or project in the Projects View.");
-				selection=null;
-				return null;
-			}
-		}
-
-		// We iterate here only to handle the possibility of multiple-selection.
-		// graphCreator will descend into child nodes.
-		for (Iterator iter = selection.iterator(); iter.hasNext();) {
-			Object obj = (Object) iter.next();
-			// It can be a Project, Folder, File, etc...
-			if (obj instanceof IAdaptable) {
-				IAdaptable iad = (IAdaptable) obj;
-				final IResource res = (IResource) iad.getAdapter(IResource.class);
-				// Note: put this in a Job or WorkspaceModifyOperation if resources
-				// will be changed.
-				if (res != null) {
-					callGraph = graphCreator.initCallGraph(res);
-				} else {
-					message("Please select a file, folder, or project in the Projects view");
-					selection=null;
-					return null;
-				}
-			}
-		}
-		System.out.println("resources scanned. Now search for callers/callees");
-		graphCreator.computeCallGraph(callGraph);
-		System.out.println("showCallGraph...");
-		graphCreator.showCallGraph(callGraph);
-		System.out.println("showCallGraph complete.");
-		return null;
-	}
-
-	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-		if (selection instanceof IStructuredSelection) {
-			this.selection = (IStructuredSelection) selection;
-			System.out.println("BuildCallGraphHandler got selection");
-		}
-
-	}
-
-	public void message(String msg) {
-		MessageDialog.openInformation(window.getShell(),
-				"Houston, we have a problem", msg);
-	}
-}